treewide: Make explicit that 'dev' output of bzip2 is used
This commit is contained in:
parent
825bd69b38
commit
c22f86a853
@ -187,7 +187,7 @@ let
|
||||
};
|
||||
|
||||
bz2 = {
|
||||
configureFlags = ["--with-bz2=${bzip2}"];
|
||||
configureFlags = ["--with-bz2=${bzip2.dev}"];
|
||||
buildInputs = [bzip2];
|
||||
};
|
||||
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
setupPyBuildFlags =
|
||||
[ "--hdf5=${hdf5}"
|
||||
"--lzo=${lzo}"
|
||||
"--bzip2=${bzip2}"
|
||||
"--bzip2=${bzip2.dev}"
|
||||
];
|
||||
|
||||
# Run the test suite.
|
||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = [
|
||||
"--with-zlib=${zlib}"
|
||||
"--with-libbz2-prefix=${bzip2}"
|
||||
"--with-libbz2-prefix=${bzip2.dev}"
|
||||
"--with-iconv-dir=${libiconv}"
|
||||
"--with-xml=${libxml2}"
|
||||
"--with-openssl=${openssl}"
|
||||
|
@ -2032,7 +2032,7 @@ let self = _self // overrides; _self = with self; {
|
||||
# Don't build a private copy of bzip2.
|
||||
BUILD_BZIP2 = false;
|
||||
BZIP2_LIB = "${pkgs.bzip2.out}/lib";
|
||||
BZIP2_INCLUDE = "${pkgs.bzip2}/include";
|
||||
BZIP2_INCLUDE = "${pkgs.bzip2.dev}/include";
|
||||
|
||||
meta = {
|
||||
homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;
|
||||
|
Loading…
Reference in New Issue
Block a user