JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glib: no one wants --witih-libiconv=gnu

Browse Source 
Previously this was set on FreBSD and SunOS...
This commit is contained in:
Will Dietz 2018-03-23 22:49:02 -05:00
parent ba18240b26
commit f623858a82
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,9 +73,6 @@ 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"
# glibc inclues GNU libiconv, but Darwin's iconv function is good enonugh.
++ 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)