diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-29 06:52:24 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-29 06:52:24 +0100 |
| commit | a073e7f16380c43090f6796bfa6514ef6a27bf14 (patch) | |
| tree | a012babe5e8d20c5946f2c8323f985e3dc1b8791 | |
| parent | 64ba681f4808582bbdef5dfc8716feeaf5e9d77c (diff) | |
| parent | 82ebace595bd3de93b697681180fa13e4fd6b491 (diff) | |
| download | nixpkgs-a073e7f16380c43090f6796bfa6514ef6a27bf14.tar nixpkgs-a073e7f16380c43090f6796bfa6514ef6a27bf14.tar.gz nixpkgs-a073e7f16380c43090f6796bfa6514ef6a27bf14.tar.bz2 nixpkgs-a073e7f16380c43090f6796bfa6514ef6a27bf14.tar.lz nixpkgs-a073e7f16380c43090f6796bfa6514ef6a27bf14.tar.xz nixpkgs-a073e7f16380c43090f6796bfa6514ef6a27bf14.tar.zst nixpkgs-a073e7f16380c43090f6796bfa6514ef6a27bf14.zip | |
Merge #34373: add comment to the first-parent commit
The PR was done in parallel.
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 2071eb935ae..f68bd138005 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { # internal pcre would only add <200kB, but it's relatively common configureFlags = [ "--with-pcre=system" ] ++ 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" |