From eaa9e01c1d453bb42fc6f91336d01f94cbabb465 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 30 Jan 2017 13:03:48 +0100
Subject: [PATCH] Revert "binutils: Add lib output"

This reverts commit 17a344a5daebf7796e5b25f45658359b6c0dfda2.
---
 .../tools/misc/binutils/default.nix           |  8 +-------
 .../tools/misc/binutils/no-plugins.patch      | 19 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/binutils/no-plugins.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 0214cafb1a7..4c32255e875 100644
--- 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
deleted file mode 100644
index 9624b7976b7..00000000000
--- a/pkgs/development/tools/misc/binutils/no-plugins.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c
---- binutils-2.27-orig/bfd/plugin.c	2016-10-14 17:46:30.791315555 +0200
-+++ binutils-2.27/bfd/plugin.c	2016-10-14 17:46:38.583298765 +0200
-@@ -333,6 +333,7 @@
-   if (plugin_program_name == NULL)
-     return found;
- 
-+#if 0
-   plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL);
-   p = make_relative_prefix (plugin_program_name,
- 			    BINDIR,
-@@ -364,6 +365,7 @@
-   free (p);
-   if (d)
-     closedir (d);
-+#endif
- 
-   return found;
- }