diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 114c743b3f8f..84043a583da6 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -15,7 +15,7 @@ in , perl , texinfo , zlib -, gold ? execFormatIsELF stdenv.targetPlatform +, enableGold ? execFormatIsELF stdenv.targetPlatform , enableShared ? !stdenv.hostPlatform.isStatic # Enabling all targets increases output size to a multiple. , withAllTargets ? false, libbfd, libopcodes @@ -23,7 +23,7 @@ in # configure silently disables ld.gold if it's unsupported, # so we need to make sure that intent matches result ourselves. -assert gold -> execFormatIsELF stdenv.targetPlatform; +assert enableGold -> execFormatIsELF stdenv.targetPlatform; # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -147,7 +147,7 @@ stdenv.mkDerivation { # The easiest thing for us to do is not leave it to chance, and force # the program prefix to be what we want it to be. "--program-prefix=${targetPrefix}" - ] ++ lib.optionals gold [ + ] ++ lib.optionals enableGold [ "--enable-gold" "--enable-plugins" ]; @@ -167,7 +167,7 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; - hasGold = gold; + hasGold = enableGold; isGNU = true; }; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index d2c28b97ff93..2b613d118c5a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -204,7 +204,7 @@ in # Rebuild binutils to use from stage2 onwards. overrides = self: super: { binutils-unwrapped = super.binutils-unwrapped.override { - gold = false; + enableGold = false; }; inherit (prevStage) ccWrapperStdenv diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index e1ddfcf28d55..6384107ec471 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -37,7 +37,7 @@ in with pkgs; rec { bootBinutils = binutils.bintools.override { withAllTargets = false; # Don't need two linkers, disable whatever's not primary/default. - gold = false; + enableGold = false; # bootstrap is easier w/static enableShared = false; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fa2d5eb471a..923635b7be70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14644,7 +14644,7 @@ with pkgs; }; binutils_nogold = lowPrio (wrapBintoolsWith { bintools = binutils-unwrapped.override { - gold = false; + enableGold = false; }; }); binutilsNoLibc = wrapBintoolsWith {