diff options
author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2015-11-04 08:26:11 +0000 |
---|---|---|
committer | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2015-11-18 16:33:36 +0000 |
commit | 094c374941e68bf667719da15c655f148840ebab (patch) | |
tree | 259bc1ecdf27c9aea2c89555998ad07b7225f992 /pkgs/tools/compression/bzip2 | |
parent | baf30718ca5415dcd44767c3046a30d500a7ceb5 (diff) | |
download | nixlib-094c374941e68bf667719da15c655f148840ebab.tar nixlib-094c374941e68bf667719da15c655f148840ebab.tar.gz nixlib-094c374941e68bf667719da15c655f148840ebab.tar.bz2 nixlib-094c374941e68bf667719da15c655f148840ebab.tar.lz nixlib-094c374941e68bf667719da15c655f148840ebab.tar.xz nixlib-094c374941e68bf667719da15c655f148840ebab.tar.zst nixlib-094c374941e68bf667719da15c655f148840ebab.zip |
bzip2: fix cross build on mingw by using autoconf patch
Diffstat (limited to 'pkgs/tools/compression/bzip2')
-rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 64 |
1 files changed, 20 insertions, 44 deletions
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index a485bf5eab68..286ad16cc861 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,11 +1,7 @@ -{ stdenv, fetchurl, linkStatic ? false }: +{ stdenv, fetchurl, libtool, autoconf, automake, pkgconfig, gnum4 }: let version = "1.0.6"; - - sharedLibrary = !stdenv.isDarwin && !(stdenv ? isStatic) - && stdenv.system != "i686-cygwin" && !linkStatic; - in stdenv.mkDerivation { name = "bzip2-${version}"; @@ -14,49 +10,29 @@ in stdenv.mkDerivation { sha256 = "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152"; }; - crossAttrs = { - patchPhase = '' - sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c - sed -i -e 's/CC=gcc/CC=${stdenv.cross.config}-gcc/' \ - -e 's/AR=ar/AR=${stdenv.cross.config}-ar/' \ - -e 's/RANLIB=ranlib/RANLIB=${stdenv.cross.config}-ranlib/' \ - -e 's/bzip2recover test/bzip2recover/' \ - Makefile* - ''; - }; - - preBuild = stdenv.lib.optionalString sharedLibrary '' - make -f Makefile-libbz2_so - ''; + patches = [ + # original upstream for the autoconf patch is here: + # http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch + # but we get the mingw-builds version of the patch, which fixes + # a few more issues + (fetchurl { + url = "https://raw.githubusercontent.com/niXman/mingw-builds/17ae841dcf6e72badad7941a06d631edaf687436/patches/bzip2/bzip2-1.0.6-autoconfiscated.patch"; + sha256 = "1flbd3i8vg9kzq0a712qcg9j2c4ymnqvgd0ldyafpzvbqj1iicnp"; + }) + ]; - preInstall = stdenv.lib.optionalString sharedLibrary '' - mkdir -p $out/lib - mv libbz2.so* $out/lib - ( cd $out/lib && - ln -s libbz2.so.1.0.? libbz2.so && - ln -s libbz2.so.1.0.? libbz2.so.1 - ) - ''; + patchFlags = "-p0"; - installFlags = [ "PREFIX=$(out)" ]; + nativeBuildInputs = [ libtool autoconf automake gnum4 pkgconfig ]; - postInstall = '' - rm $out/bin/bunzip2* $out/bin/bzcat* - ln -s bzip2 $out/bin/bunzip2 - ln -s bzip2 $out/bin/bzcat - ''; + preConfigure = "sh ./autogen.sh"; - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang' - ''; - - preConfigure = '' - substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man' - ''; - - makeFlags = stdenv.lib.optional linkStatic "LDFLAGS=-static"; - - inherit linkStatic; + crossAttrs = { + # https://github.com/niXman/mingw-builds/blob/master/patches/bzip2/bzip2-1.0.5-slash.patch + postPatch = '' + sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c + ''; + }; meta = { homepage = "http://www.bzip.org"; |