Skip to content

Commit 570c0b3

Browse files
committedSep 21, 2017
transfig: cleanup and fix darwin clang
1 parent ae4f2fb commit 570c0b3

File tree

2 files changed

+43
-52
lines changed

2 files changed

+43
-52
lines changed
 

‎pkgs/tools/graphics/transfig/builder.sh

-38
This file was deleted.

‎pkgs/tools/graphics/transfig/default.nix

+43-14
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,62 @@
22

33
stdenv.mkDerivation rec {
44
name = "transfig-3.2.4";
5-
builder = ./builder.sh;
65
src = fetchurl {
76
url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz;
87
sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4";
98
};
109

1110
buildInputs = [zlib libjpeg libpng imake];
12-
inherit libpng;
1311

14-
hardeningDisable = [ "format" ];
12+
patches = [
13+
./patch-fig2dev-dev-Imakefile
14+
./patch-fig2dev-Imakefile
15+
./patch-transfig-Imakefile
16+
./patch-fig2dev-fig2dev.h
17+
./patch-fig2dev-dev-gensvg.c
18+
];
19+
20+
patchPhase = ''
21+
runHook prePatch
22+
23+
configureImakefiles() {
24+
local sedcmd=$1
25+
26+
sed "$sedcmd" fig2dev/Imakefile > tmpsed
27+
cp tmpsed fig2dev/Imakefile
1528
16-
patches = [prefixPatch1 prefixPatch2 prefixPatch3 varargsPatch gensvgPatch];
29+
sed "$sedcmd" fig2dev/dev/Imakefile > tmpsed
30+
cp tmpsed fig2dev/dev/Imakefile
1731
18-
prefixPatch1 =
19-
./patch-fig2dev-dev-Imakefile;
32+
sed "$sedcmd" transfig/Imakefile > tmpsed
33+
cp tmpsed transfig/Imakefile
34+
}
2035
21-
prefixPatch2 =
22-
./patch-fig2dev-Imakefile;
36+
for i in $patches; do
37+
header "applying patch $i" 3
38+
patch -p0 < $i
39+
stopNest
40+
done
2341
24-
prefixPatch3 =
25-
./patch-transfig-Imakefile;
42+
configureImakefiles "s:__PREFIX_PNG:${libpng}:"
43+
configureImakefiles "s:__PREFIX:$out:"
2644
27-
varargsPatch =
28-
./patch-fig2dev-fig2dev.h;
45+
runHook postPatch
46+
'';
2947

30-
gensvgPatch =
31-
./patch-fig2dev-dev-gensvg.c;
48+
preBuild = ''
49+
xmkmf
50+
make Makefiles
51+
'';
52+
53+
makeFlags = [ "CC=cc" ];
54+
55+
preInstall = ''
56+
mkdir -p $out
57+
mkdir -p $out/lib
58+
'';
59+
60+
hardeningDisable = [ "format" ];
3261

3362
meta = {
3463
platforms = stdenv.lib.platforms.unix;

0 commit comments

Comments
 (0)