Skip to content

Commit

Permalink
glib: fixup build on Darwin after #34198
Browse files Browse the repository at this point in the history
hopefully
  • Loading branch information
vcunat committed Jan 29, 2018
1 parent e2a5426 commit 64ba681
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkgs/development/libraries/glib/default.nix
Expand Up @@ -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)
Expand Down

0 comments on commit 64ba681

Please sign in to comment.