diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-05-12 16:53:11 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-05-12 16:53:11 -0500 |
| commit | 61b94dff81d11b85b7300b5f517344ac6808b395 (patch) | |
| tree | 6fb690a317b0bb6b32d07b1374b063900073bf3b /pkgs/development/libraries/glib | |
| parent | 7d1d270a7a25e6ad7d7fc2ad44d2db91185e0721 (diff) | |
Get glib, gtk+, harfbuzz and pango working on Darwin
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 033a1def3ce70..b1dd66584f4a2 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -55,7 +55,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext perl python ]; - propagatedBuildInputs = [ pcre zlib libffi ] ++ libiconvOrEmpty ++ libintlOrEmpty; + propagatedBuildInputs = [ pcre zlib libffi ] + ++ optional (!stdenv.isDarwin) libiconvOrEmpty + ++ libintlOrEmpty; configureFlags = optional stdenv.isDarwin "--disable-compile-warnings" |