Revert "binutils: Add lib output"

This reverts commit 17a344a.
NixOS · Jan 30, 2017 · eaa9e01 · eaa9e01
1 parent 1c5237e
commit eaa9e01
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26 deletions.
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
@@ -32,15 +32,9 @@ stdenv.mkDerivation rec {
     # This is needed, for instance, so that running "ldd" on a binary that is
     # PaX-marked to disable mprotect doesn't fail with permission denied.
     ./pt-pax-flags.patch
-
-    # Bfd looks in BINDIR/../lib for some plugins that don't
-    # exist. This is pointless (since users can't install plugins
-    # there) and causes a cycle between the lib and bin outputs, so
-    # get rid of it.
-    ./no-plugins.patch
   ];
 
-  outputs = [ "out" "lib" "info" ] ++ (optional (cross == null) "dev");
+  outputs = [ "out" "info" ] ++ (optional (cross == null) "dev");
 
   nativeBuildInputs = [ bison ];
   buildInputs = [ zlib ];

diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch