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

This commit is contained in:
Robin Gloster
2016-04-18 13:00:40 +00:00
1369 changed files with 35810 additions and 10571 deletions

View File

@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
./fix-update-symbol-version.patch
];
outputs = [ "out" "info" ];
outputs = (optional (cross == null) "dev") ++ [ "out" "info" ];
nativeBuildInputs = [ bison ];
buildInputs = [ zlib ];
@@ -78,6 +78,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postFixup = optionalString (cross == null) "ln -s $out/bin $dev/bin"; # tools needed for development
meta = with stdenv.lib; {
description = "Tools for manipulating binaries (linker, assembler, etc.)";
longDescription = ''

File diff suppressed because it is too large Load Diff