From aa9448db2abf5fea1086eb43f1d7bedf5a23b85b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 21 Feb 2022 12:19:22 -0800 Subject: [PATCH] binutils: move src hack out of srcs attrset --- pkgs/development/tools/misc/binutils/default.nix | 10 ++++++---- 1 file 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