diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 19:46:12 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:28 +0200 |
| commit | c22f86a853a5045b9d4b6cd79425d968de24b999 (patch) | |
| tree | f95a2b9677e3a4165787dc02e23874e5674e8f9e | |
| parent | 825bd69b38bc73ae3174a5b357090d79be773233 (diff) | |
| download | nixpkgs-c22f86a853a5045b9d4b6cd79425d968de24b999.tar nixpkgs-c22f86a853a5045b9d4b6cd79425d968de24b999.tar.gz nixpkgs-c22f86a853a5045b9d4b6cd79425d968de24b999.tar.bz2 nixpkgs-c22f86a853a5045b9d4b6cd79425d968de24b999.tar.lz nixpkgs-c22f86a853a5045b9d4b6cd79425d968de24b999.tar.xz nixpkgs-c22f86a853a5045b9d4b6cd79425d968de24b999.tar.zst nixpkgs-c22f86a853a5045b9d4b6cd79425d968de24b999.zip | |
treewide: Make explicit that 'dev' output of bzip2 is used
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/python-modules/tables/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/clamav/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 5856604c53d..7466abeaf82 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -187,7 +187,7 @@ let }; bz2 = { - configureFlags = ["--with-bz2=${bzip2}"]; + configureFlags = ["--with-bz2=${bzip2.dev}"]; buildInputs = [bzip2]; }; diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index b3003dfa954..88a39400c77 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { setupPyBuildFlags = [ "--hdf5=${hdf5}" "--lzo=${lzo}" - "--bzip2=${bzip2}" + "--bzip2=${bzip2.dev}" ]; # Run the test suite. diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index bebb8a95a58..b76168e68ed 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -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}" diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 020ff87d360..ca7c4b3d153 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -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; |