diff options
| author | Peter Simons <simons@cryp.to> | 2013-09-23 10:59:44 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-09-23 10:59:44 +0200 |
| commit | 9407832de442a44a944146f1c433cf3442c3a1bb (patch) | |
| tree | b73362aa353005a319bf1468e1f516bd14103afe /pkgs/development/libraries/gettext | |
| parent | e4f6e4b15d082dece20abd4d274d035f599d4cc2 (diff) | |
| parent | 95c8d04843059b6f54110ff8ecb4d48091fb6df9 (diff) | |
Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts: pkgs/development/libraries/gettext/default.nix
Diffstat (limited to 'pkgs/development/libraries/gettext')
| -rw-r--r-- | pkgs/development/libraries/gettext/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c9596d66ee2af..19a3a0f18b3db 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -70,9 +70,11 @@ stdenv.mkDerivation (rec { }; } -// +// optionalAttrs stdenv.isDarwin { + makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; +} -stdenv.lib.optionalAttrs stdenv.isCygwin { +// optionalAttrs stdenv.isCygwin { patchPhase = # Make sure `error.c' gets compiled and is part of `libgettextlib.la'. # This fixes: |