From 72c6cc879e373a589db32da2b4be8b7315ca0394 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 23 Aug 2022 07:31:26 +0100
Subject: [PATCH] libbfd, libopcodes: moves closer to binutils nix expressions

Having all 3 of binutils, libbfd, libopcodes in one directory eases
copying of the whole directory when we need to hold back old version of
the whole of binutils or of it's pieces.
---
 .../misc/binutils/libbfd.nix}                     |  2 +-
 .../misc/binutils/libopcodes.nix}                 |  2 +-
 pkgs/top-level/all-packages.nix                   | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)
 rename pkgs/development/{libraries/libbfd/default.nix => tools/misc/binutils/libbfd.nix} (96%)
 rename pkgs/development/{libraries/libopcodes/default.nix => tools/misc/binutils/libopcodes.nix} (94%)

diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/tools/misc/binutils/libbfd.nix
similarity index 96%
rename from pkgs/development/libraries/libbfd/default.nix
rename to pkgs/development/tools/misc/binutils/libbfd.nix
index 45fe337d8588..eed23a746d2a 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/tools/misc/binutils/libbfd.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" ];
 
   patches = binutils-unwrapped.patches ++ [
-    ../../tools/misc/binutils/build-components-separately.patch
+    ./build-components-separately.patch
     (fetchpatch {
       url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch";
       sha256 = "0pzb3i74d1r7lhjan376h59a7kirw15j7swwm8pz3zy9lkdqkj6q";
diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/tools/misc/binutils/libopcodes.nix
similarity index 94%
rename from pkgs/development/libraries/libopcodes/default.nix
rename to pkgs/development/tools/misc/binutils/libopcodes.nix
index e448d225b993..e4b6cec41b4f 100644
--- a/pkgs/development/libraries/libopcodes/default.nix
+++ b/pkgs/development/tools/misc/binutils/libopcodes.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   outputs = [ "out" "dev" ];
 
   patches = binutils-unwrapped.patches ++ [
-    ../../tools/misc/binutils/build-components-separately.patch
+    ./build-components-separately.patch
   ];
 
   # We just want to build libopcodes
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cf743a4a780..4f8729dc356b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15602,6 +15602,14 @@ with pkgs;
     libc = preLibcCrossHeaders;
   };
 
+  libbfd = callPackage ../development/tools/misc/binutils/libbfd.nix {
+    autoreconfHook = buildPackages.autoreconfHook269;
+  };
+
+  libopcodes = callPackage ../development/tools/misc/binutils/libopcodes.nix {
+    autoreconfHook = buildPackages.autoreconfHook269;
+  };
+
   # Here we select the default bintools implementations to be used.  Note when
   # cross compiling these are used not for this stage but the *next* stage.
   # That is why we choose using this stage's target platform / next stage's
@@ -17315,13 +17323,6 @@ with pkgs;
 
   belle-sip = callPackage ../development/libraries/belle-sip { };
 
-  libbfd = callPackage ../development/libraries/libbfd {
-    autoreconfHook = buildPackages.autoreconfHook269;
-  };
-
-  libopcodes = callPackage ../development/libraries/libopcodes {
-    autoreconfHook = buildPackages.autoreconfHook269;
-  };
 
   bicpl = callPackage ../development/libraries/science/biology/bicpl { };