diff options
| author | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2015-11-23 11:25:03 +0000 |
|---|---|---|
| committer | Matthias C. M. Troffaes <matthias.troffaes@gmail.com> | 2015-11-23 11:25:03 +0000 |
| commit | aeb3d8ce4c9fcb26e18b96d90f5d4bdb7a1cc230 (patch) | |
| tree | 16eba4db69768f46c2814ec10931d78567ec31c7 /pkgs/tools/compression | |
| parent | 5f25c63bfd599228748726b2ba7d43754f5a0b3b (diff) | |
| download | nixlib-aeb3d8ce4c9fcb26e18b96d90f5d4bdb7a1cc230.tar nixlib-aeb3d8ce4c9fcb26e18b96d90f5d4bdb7a1cc230.tar.gz nixlib-aeb3d8ce4c9fcb26e18b96d90f5d4bdb7a1cc230.tar.bz2 nixlib-aeb3d8ce4c9fcb26e18b96d90f5d4bdb7a1cc230.tar.lz nixlib-aeb3d8ce4c9fcb26e18b96d90f5d4bdb7a1cc230.tar.xz nixlib-aeb3d8ce4c9fcb26e18b96d90f5d4bdb7a1cc230.tar.zst nixlib-aeb3d8ce4c9fcb26e18b96d90f5d4bdb7a1cc230.zip | |
bzip2: fix cross build on mingw by using autoconf patch
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/bzip2/default.nix | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index a485bf5eab68..3e835c30e3d7 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, linkStatic ? false }: +{ stdenv, fetchurl, libtool, autoconf, automake, gnum4, linkStatic ? false }: let version = "1.0.6"; @@ -15,14 +15,26 @@ in stdenv.mkDerivation { }; crossAttrs = { - patchPhase = '' + buildInputs = [ libtool autoconf automake gnum4 ]; + 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"; + }) + ]; + patchFlags = "-p0"; + postPatch = '' 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* ''; + preConfigure = "sh ./autogen.sh"; + # clear native hooks that are not needed with autoconf + preBuild = ""; + preInstall = ""; + postInstall = ""; }; preBuild = stdenv.lib.optionalString sharedLibrary '' |