diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-12 21:14:44 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 09:44:30 -0600 |
| commit | 3aa61e33bedc13f1db6c7b62db76ce2b412340cd (patch) | |
| tree | 09a946309b65dcf7e570232ccd407c321c1eab26 /pkgs/tools | |
| parent | afe517acd5bf023c1015b8c3467f2c3f95d78720 (diff) | |
| download | nixlib-3aa61e33bedc13f1db6c7b62db76ce2b412340cd.tar nixlib-3aa61e33bedc13f1db6c7b62db76ce2b412340cd.tar.gz nixlib-3aa61e33bedc13f1db6c7b62db76ce2b412340cd.tar.bz2 nixlib-3aa61e33bedc13f1db6c7b62db76ce2b412340cd.tar.lz nixlib-3aa61e33bedc13f1db6c7b62db76ce2b412340cd.tar.xz nixlib-3aa61e33bedc13f1db6c7b62db76ce2b412340cd.tar.zst nixlib-3aa61e33bedc13f1db6c7b62db76ce2b412340cd.zip | |
nix: simplify bzip2 dependency, this is handled properly now
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index fc731c54f456..91844bdb9dde 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -27,7 +27,7 @@ let ++ lib.optionals (!is20) [ curl perl ] ++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]; - buildInputs = [ curl openssl sqlite xz ] + buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals fromGit [ brotli ] # Since 1.12 ++ lib.optional stdenv.isLinux libseccomp @@ -39,15 +39,6 @@ let propagatedBuildInputs = [ boehmgc ]; - # 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.dev}/include" - export LIBRARY_PATH="${bzip2.out}/lib" - export CXXFLAGS="-Wno-error=reserved-user-defined-literal" - ''; - configureFlags = [ "--with-store-dir=${storeDir}" "--localstatedir=${stateDir}" @@ -75,11 +66,6 @@ let separateDebugInfo = stdenv.isLinux; crossAttrs = { - postUnpack = - '' export CPATH="${bzip2.crossDrv}/include" - export NIX_CROSS_LDFLAGS="-L${bzip2.crossDrv}/lib -rpath-link ${bzip2.crossDrv}/lib $NIX_CROSS_LDFLAGS" - ''; - configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} |