Merge remote-tracking branch 'origin/master' into stdenv-updates.

Conflicts: pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
parent e4f6e4b15d 95c8d04843
commit 9407832de4
192 changed files with 6739 additions and 2520 deletions
@@ -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: