diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-18 23:42:25 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-18 23:59:23 +0200 |
| commit | 1f81984293c72b63d5ee2d2d2e9e36e1116238bd (patch) | |
| tree | e18485dfb741a542a74d646278faa0b78f1138cd /pkgs/development/libraries/glib | |
| parent | 83dee22f4a69c81a827c23cade14f7e02df3ec79 (diff) | |
| download | nixpkgs-1f81984293c72b63d5ee2d2d2e9e36e1116238bd.tar nixpkgs-1f81984293c72b63d5ee2d2d2e9e36e1116238bd.tar.gz nixpkgs-1f81984293c72b63d5ee2d2d2e9e36e1116238bd.tar.bz2 nixpkgs-1f81984293c72b63d5ee2d2d2e9e36e1116238bd.tar.lz nixpkgs-1f81984293c72b63d5ee2d2d2e9e36e1116238bd.tar.xz nixpkgs-1f81984293c72b63d5ee2d2d2e9e36e1116238bd.tar.zst nixpkgs-1f81984293c72b63d5ee2d2d2e9e36e1116238bd.zip | |
non-Linux: more adjustments
Also reordered stuff in all-packages.nix.
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 747a18f04cc..7469b07ce86 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (rec { }; # configure script looks for d-bus but it is only needed for tests - buildInputs = [ libelf ] ++ libiconvOrEmpty; + buildInputs = [ libelf ]; nativeBuildInputs = [ perl pkgconfig gettext python ]; - propagatedBuildInputs = [ pcre zlib libffi ]; + propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty; configureFlags = "--with-pcre=system --disable-fam"; |