diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-09 11:34:02 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-09 11:34:02 -0400 |
| commit | a1300037d222714b1a58f2ea9072fefcbbb118f2 (patch) | |
| tree | 44f710e0934bffe71da7352b3dde38fc22137ecb | |
| parent | f81a86d4b965655c48ef80d1d5a66eb3b7816ffd (diff) | |
| download | nixpkgs-a1300037d222714b1a58f2ea9072fefcbbb118f2.tar nixpkgs-a1300037d222714b1a58f2ea9072fefcbbb118f2.tar.gz nixpkgs-a1300037d222714b1a58f2ea9072fefcbbb118f2.tar.bz2 nixpkgs-a1300037d222714b1a58f2ea9072fefcbbb118f2.tar.lz nixpkgs-a1300037d222714b1a58f2ea9072fefcbbb118f2.tar.xz nixpkgs-a1300037d222714b1a58f2ea9072fefcbbb118f2.tar.zst nixpkgs-a1300037d222714b1a58f2ea9072fefcbbb118f2.zip | |
glib: Propagate pcre
http://hydra.nixos.org/build/3150785
| -rw-r--r-- | pkgs/development/libraries/glib/2.34.x.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/development/libraries/glib/2.34.x.nix b/pkgs/development/libraries/glib/2.34.x.nix index 6925571020c..904647721dd 100644 --- a/pkgs/development/libraries/glib/2.34.x.nix +++ b/pkgs/development/libraries/glib/2.34.x.nix @@ -20,14 +20,11 @@ stdenv.mkDerivation rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ pcre ] - ++ (if libiconvOrNull != null - then [ libiconvOrNull ] - else []); + buildInputs = [ libiconvOrNull ]; buildNativeInputs = [ perl pkgconfig gettext python ]; - propagatedBuildInputs = [ zlib libffi ]; + propagatedBuildInputs = [ pcre zlib libffi ]; configureFlags = "--with-pcre=system --disable-fam"; |