diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2017-09-22 00:23:39 +0200 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2017-09-22 00:25:22 +0200 |
commit | 570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d (patch) | |
tree | 500888330a0c2754738a258f8648f7e18cbc9ed7 /pkgs/tools/graphics/transfig | |
parent | ae4f2fbb41b2824869000eb1f10d8c27315d4537 (diff) | |
download | nixlib-570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d.tar nixlib-570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d.tar.gz nixlib-570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d.tar.bz2 nixlib-570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d.tar.lz nixlib-570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d.tar.xz nixlib-570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d.tar.zst nixlib-570c0b3a7292e62a9014e6a2a6ed77b47b8dd52d.zip |
transfig: cleanup and fix darwin clang
Diffstat (limited to 'pkgs/tools/graphics/transfig')
-rw-r--r-- | pkgs/tools/graphics/transfig/builder.sh | 38 | ||||
-rw-r--r-- | pkgs/tools/graphics/transfig/default.nix | 57 |
2 files changed, 43 insertions, 52 deletions
diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh deleted file mode 100644 index c466f759446c..000000000000 --- a/pkgs/tools/graphics/transfig/builder.sh +++ /dev/null @@ -1,38 +0,0 @@ -source $stdenv/setup - -patchPhase() { - for i in $patches; do - header "applying patch $i" 3 - patch -p0 < $i - stopNest - done - - configureImakefiles "s:__PREFIX_PNG:$libpng:" - configureImakefiles "s:__PREFIX:$out:" -} - -configureImakefiles() { - local sedcmd=$1 - - sed "${sedcmd}" fig2dev/Imakefile > tmpsed - cp tmpsed fig2dev/Imakefile - - sed "${sedcmd}" fig2dev/dev/Imakefile > tmpsed - cp tmpsed fig2dev/dev/Imakefile - - sed "${sedcmd}" transfig/Imakefile > tmpsed - cp tmpsed transfig/Imakefile -} - -buildPhase() { - xmkmf - make Makefiles - make -} - -preInstall() { - mkdir -p $out - mkdir -p $out/lib -} - -genericBuild diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index 948bba6d459f..cb3f0edff0f8 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -2,33 +2,62 @@ stdenv.mkDerivation rec { name = "transfig-3.2.4"; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; buildInputs = [zlib libjpeg libpng imake]; - inherit libpng; - hardeningDisable = [ "format" ]; + patches = [ + ./patch-fig2dev-dev-Imakefile + ./patch-fig2dev-Imakefile + ./patch-transfig-Imakefile + ./patch-fig2dev-fig2dev.h + ./patch-fig2dev-dev-gensvg.c + ]; + + patchPhase = '' + runHook prePatch + + configureImakefiles() { + local sedcmd=$1 + + sed "$sedcmd" fig2dev/Imakefile > tmpsed + cp tmpsed fig2dev/Imakefile - patches = [prefixPatch1 prefixPatch2 prefixPatch3 varargsPatch gensvgPatch]; + sed "$sedcmd" fig2dev/dev/Imakefile > tmpsed + cp tmpsed fig2dev/dev/Imakefile - prefixPatch1 = - ./patch-fig2dev-dev-Imakefile; + sed "$sedcmd" transfig/Imakefile > tmpsed + cp tmpsed transfig/Imakefile + } - prefixPatch2 = - ./patch-fig2dev-Imakefile; + for i in $patches; do + header "applying patch $i" 3 + patch -p0 < $i + stopNest + done - prefixPatch3 = - ./patch-transfig-Imakefile; + configureImakefiles "s:__PREFIX_PNG:${libpng}:" + configureImakefiles "s:__PREFIX:$out:" - varargsPatch = - ./patch-fig2dev-fig2dev.h; + runHook postPatch + ''; - gensvgPatch = - ./patch-fig2dev-dev-gensvg.c; + preBuild = '' + xmkmf + make Makefiles + ''; + + makeFlags = [ "CC=cc" ]; + + preInstall = '' + mkdir -p $out + mkdir -p $out/lib + ''; + + hardeningDisable = [ "format" ]; meta = { platforms = stdenv.lib.platforms.unix; |