Author: ludo Date: Sun Apr 1 12:08:44 2012 New Revision: 33515 URL: https://nixos.org/websvn/nix/?rev=33515&sc=1
Log: nixUnstable: Fix cross-compilation native/cross mismatch with bzip2. See <http://hydra.nixos.org/build/2345751> for the original symptom. Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Modified: nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix ============================================================================== --- nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Sun Apr 1 12:08:39 2012 (r33514) +++ nixpkgs/trunk/pkgs/tools/package-management/nix/unstable.nix Sun Apr 1 12:08:44 2012 (r33515) @@ -13,7 +13,16 @@ }; buildNativeInputs = [ perl pkgconfig ]; - buildInputs = [ curl openssl boehmgc bzip2 sqlite ]; + + buildInputs = [ curl openssl boehmgc sqlite ]; + + # Note: bzip2 is not passed as a build input, because the unpack phase + # would end up using the wrong bzip2 when cross-compiling. + # XXX: The right thing would be to reinstate `--with-bzip2' in Nix. + postUnpack = + '' export CPATH="${bzip2}/include" + export LIBRARY_PATH="${bzip2}/lib" + ''; configureFlags = '' @@ -26,6 +35,11 @@ ''; crossAttrs = { + postUnpack = + '' export CPATH="${bzip2.hostDrv}/include" + export NIX_CROSS_LDFLAGS="-L${bzip2.hostDrv}/lib -rpath-link ${bzip2.hostDrv}/lib $NIX_CROSS_LDFLAGS" + ''; + configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} _______________________________________________ nix-commits mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-commits
