public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binutils and cctools: Prefix derivation names with target for cross

Browse Source 
We want platform triple prefixes and suffixes on derivation names to
be used consistently. The ideom this commit strives for is

 - suffix means build != host, i.e. cross *built* packages. This is
   already done.

 - prefix means build != target, i.e. cross tools. This matches the
   tradition of such binaries themselves being prefixed to disambiguate.]
   Binutils and cctools, as build tools, now use the latter
This commit is contained in:
John Ericson 2017-04-24 16:00:11 -04:00
parent 88ea6463a3
commit 7018dfb9f4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ let basename = "binutils-2.28"; in
let inherit (stdenv.lib) optional optionals optionalString; in let inherit (stdenv.lib) optional optionals optionalString; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = basename + optionalString (cross != null) "-${cross.config}"; name = optionalString (cross != null) "${cross.config}-" + basename;
src = fetchurl { src = fetchurl {
url = "mirror://gnu/binutils/${basename}.tar.bz2"; url = "mirror://gnu/binutils/${basename}.tar.bz2";

2
pkgs/os-specific/darwin/binutils/default.nix
View File

@ -15,7 +15,7 @@ in
# TODO loop over prefixed binaries too # TODO loop over prefixed binaries too
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cctools-binutils-darwin"; name = "${prefix}cctools-binutils-darwin";
buildCommand = '' buildCommand = ''
mkdir -p $out/bin $out/include mkdir -p $out/bin $out/include

2
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -19,7 +19,7 @@ assert (!isDarwin hostPlatform.parsed) -> (maloader != null && xctoolchain != nu
let let
baseParams = rec { baseParams = rec {
name = "cctools-port-${version}"; name = "${prefix}cctools-port-${version}";
version = "895"; version = "895";
src = fetchFromGitHub { src = fetchFromGitHub {