cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

glib: fixup build on Darwin after #34198

Browse source 
hopefully
This commit is contained in:
Vladimír Čunát 2018-01-29 06:48:04 +01:00
parent e2a54266c4
commit 64ba681f48
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/glib/default.nix
View file

@ -75,7 +75,8 @@ stdenv.mkDerivation rec {
# internal pcre would only add <200kB, but it's relatively common # internal pcre would only add <200kB, but it's relatively common
configureFlags = [ "--with-pcre=system" ] configureFlags = [ "--with-pcre=system" ]
++ optional stdenv.isDarwin "--disable-compile-warnings" ++ 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" ++ optional stdenv.isSunOS "--disable-dtrace"
# Can't run this test when cross-compiling # Can't run this test when cross-compiling
++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform)