diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-29 06:48:04 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-29 06:48:04 +0100 |
| commit | 64ba681f4808582bbdef5dfc8716feeaf5e9d77c (patch) | |
| tree | 8423ec1d4f6ee473d82bb3c91ca3c1533cc97a41 | |
| parent | e2a54266c411e71bb5e65d9523766782728a1c3f (diff) | |
| download | nixlib-64ba681f4808582bbdef5dfc8716feeaf5e9d77c.tar nixlib-64ba681f4808582bbdef5dfc8716feeaf5e9d77c.tar.gz nixlib-64ba681f4808582bbdef5dfc8716feeaf5e9d77c.tar.bz2 nixlib-64ba681f4808582bbdef5dfc8716feeaf5e9d77c.tar.lz nixlib-64ba681f4808582bbdef5dfc8716feeaf5e9d77c.tar.xz nixlib-64ba681f4808582bbdef5dfc8716feeaf5e9d77c.tar.zst nixlib-64ba681f4808582bbdef5dfc8716feeaf5e9d77c.zip | |
glib: fixup build on Darwin after #34198
hopefully
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 656cdffbb4c7..2071eb935aea 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -75,7 +75,8 @@ stdenv.mkDerivation rec { # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ optional stdenv.isDarwin "--disable-compile-warnings" - ++ optional (stdenv.hostPlatform.libc != "glibc") "--with-libiconv=gnu" + ++ optional (stdenv.hostPlatform.libc != "glibc" && !stdenv.hostPlatform.isDarwin) + "--with-libiconv=gnu" ++ optional stdenv.isSunOS "--disable-dtrace" # Can't run this test when cross-compiling ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) |