ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

treewide: Make explicit that 'dev' output of bzip2 is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:46:12 +03:00 committed by Vladimír Čunát
parent 825bd69b38
commit c22f86a853
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/php/default.nix
View File

@ -187,7 +187,7 @@ let
}; };
bz2 = { bz2 = {
configureFlags = ["--with-bz2=${bzip2}"]; configureFlags = ["--with-bz2=${bzip2.dev}"];
buildInputs = [bzip2]; buildInputs = [bzip2];
}; };

2
pkgs/development/python-modules/tables/default.nix
View File

@ -18,7 +18,7 @@ buildPythonPackage rec {
setupPyBuildFlags = setupPyBuildFlags =
[ "--hdf5=${hdf5}" [ "--hdf5=${hdf5}"
"--lzo=${lzo}" "--lzo=${lzo}"
"--bzip2=${bzip2}" "--bzip2=${bzip2.dev}"
]; ];
# Run the test suite. # Run the test suite.

2
pkgs/tools/security/clamav/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-zlib=${zlib}" "--with-zlib=${zlib}"
"--with-libbz2-prefix=${bzip2}" "--with-libbz2-prefix=${bzip2.dev}"
"--with-iconv-dir=${libiconv}" "--with-iconv-dir=${libiconv}"
"--with-xml=${libxml2}" "--with-xml=${libxml2}"
"--with-openssl=${openssl}" "--with-openssl=${openssl}"

2
pkgs/top-level/perl-packages.nix
View File

@ -2032,7 +2032,7 @@ let self = _self // overrides; _self = with self; {
# Don't build a private copy of bzip2. # Don't build a private copy of bzip2.
BUILD_BZIP2 = false; BUILD_BZIP2 = false;
BZIP2_LIB = "${pkgs.bzip2.out}/lib"; BZIP2_LIB = "${pkgs.bzip2.out}/lib";
BZIP2_INCLUDE = "${pkgs.bzip2}/include"; BZIP2_INCLUDE = "${pkgs.bzip2.dev}/include";
meta = { meta = {
homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec;