Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-03 13:34:44 +00:00
parent 3f9e8601f2 d93f917182
commit 1b979d8384
1099 changed files with 2664 additions and 513 deletions
--- a/pkgs/development/libraries/giflib/4.1.nix
+++ b/pkgs/development/libraries/giflib/4.1.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {

  meta = {
    branch = "4.1";
+    platforms = stdenv.lib.platforms.unix;
  };
 }

--- a/pkgs/development/libraries/giflib/libungif.nix
+++ b/pkgs/development/libraries/giflib/libungif.nix
@@ -8,5 +8,8 @@ stdenv.mkDerivation {
  };

  hardeningDisable = [ "format" ];
-}

+  meta = {
+    platforms = stdenv.lib.platforms.unix;
+  };
+}