Merge remote-tracking branch 'upstream/master' into staging

2017-08-24 02:08:32 +03:00
parent 0c0fad6141 b471e125c2
commit 2fc7651b25
169 changed files with 5982 additions and 5231 deletions
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -137,8 +137,9 @@ stdenv.mkDerivation ({

  hardeningDisable = [ "format" ] ++ optional (name != "gnat") "all";

-  outputs = if (hostPlatform.is64bit && langAda) then [ "out" "doc" ]
-    else [ "out" "lib" "doc" ];
+  outputs = [ "out" "man" "info" ]
+    ++ optional (!(hostPlatform.is64bit && langAda)) "lib";
+
  setOutputFlags = false;
  NIX_NO_SELF_RPATH = true;