diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-24 18:35:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 18:35:13 -0500 |
| commit | 6d3b7458cc8b10c61b4c9024d5a24e2c0eb5ed85 (patch) | |
| tree | 20539c52c68c21abea4970aac8da7592f1c6fa77 /pkgs/development/tools/misc | |
| parent | 4f1261134ef3166910e57ec84e2fcc21279cf99d (diff) | |
| parent | ef328622e0dbcdd28f8a42481633ff8db5db8f10 (diff) | |
Merge pull request #74065 from Ericson2314/cc-versions
compilers, binutils: Add version and pname
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 210659289d1e2..63713acde0e6b 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -15,7 +15,7 @@ let # is now upstream. # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 version = "2.31.1"; - basename = "binutils-${version}"; + basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -23,11 +23,12 @@ let in stdenv.mkDerivation { - name = targetPrefix + basename; + pname = targetPrefix + basename; + inherit version; # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { - url = "mirror://gnu/binutils/${basename}.tar.bz2"; + url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; }); @@ -132,7 +133,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit targetPrefix version; + inherit targetPrefix; }; meta = with lib; { |