summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernardo Meurer <bernardo@meurer.org>2022-02-21 12:19:22 -0800
committerBernardo Meurer <bernardo@meurer.org>2022-02-21 12:19:22 -0800
commit4a2257dd62ea7ef48c0904b17a47732c3749dc12 (patch)
tree8d6da9b8a1761bef543bb466f65ac7d2e2a07243
parentlibbfd: update build-components-separately.patch for 2.38 (diff)
downloadnixpkgs-origin/binutils-2.37.tar.gz
binutils: move src hack out of srcs attrsetorigin/binutils-2.37
-rw-r--r--pkgs/development/tools/misc/binutils/default.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 4a4e223ded0c..be99d8e31747 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -33,11 +33,10 @@ let
version = "2.38";
srcs = {
- # HACK: to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
- normal = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
+ normal = fetchurl {
url = "mirror://gnu/binutils/binutils-${version}.tar.bz2";
sha256 = "sha256-Bw7HHPB3pqWOC5WfBaCaNQFTeMLYpR6Q866r/jBZDvg=";
- });
+ };
vc4-none = fetchFromGitHub {
owner = "itszor";
repo = "binutils-vc4";
@@ -55,7 +54,10 @@ stdenv.mkDerivation {
pname = targetPrefix + "binutils";
inherit version;
- src = srcs.${targetPlatform.system} or srcs.normal;
+ # HACK: Ensure that we preserve source from bootstrap binutils to not rebuild LLVM
+ src = stdenv.__bootPackages.binutils-unwrapped.src
+ or srcs.${targetPlatform.system}
+ or srcs.normal;
# WARN: this package is used for bootstrapping fetchurl, and thus cannot use
# fetchpatch! All mutable patches (generated by GitHub or cgit) that are