nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-05 05:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

libbfd, libopcodes: moves closer to binutils nix expressions

Browse Source 
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.
This commit is contained in:
Sergei Trofimovich 2022-08-23 07:31:26 +01:00
parent 6895427d34
commit 72c6cc879e
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libbfd/default.nix → pkgs/development/tools/misc/binutils/libbfd.nix
View File

@ -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";

2
pkgs/development/libraries/libopcodes/default.nix → pkgs/development/tools/misc/binutils/libopcodes.nix
View File

@ -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

15
pkgs/top-level/all-packages.nix
View File

@ -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 { };