non-Linux: more adjustments

Also reordered stuff in all-packages.nix.
2013-06-18 23:42:25 +02:00
parent 83dee22f4a
commit 1f81984293
6 changed files with 20 additions and 21 deletions
--- 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";