JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix: fix paths to bzip outputs

Browse Source
This commit is contained in:
Vladimír Čunát 2015-04-18 21:37:00 +02:00
parent 4101db0bec
commit e36dd5acf8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/package-management/nix/default.nix
View File

@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
# 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"
'' export CPATH="${bzip2.dev}/include"
export LIBRARY_PATH="${bzip2.out}/lib"
export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
'';

4
pkgs/tools/package-management/nix/unstable.nix
View File

@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
# 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"
'' export CPATH="${bzip2.dev}/include"
export LIBRARY_PATH="${bzip2.out}/lib"
export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
'';