From 7018dfb9f4d1457d77495014a2e22febe2b9181a Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Mon, 24 Apr 2017 16:00:11 -0400
Subject: [PATCH] binutils and cctools: Prefix derivation names with target for
 cross

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
---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 pkgs/os-specific/darwin/binutils/default.nix     | 2 +-
 pkgs/os-specific/darwin/cctools/port.nix         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 37c312c6c6b..6bfd933bf9b 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -7,7 +7,7 @@ let basename = "binutils-2.28"; in
 let inherit (stdenv.lib) optional optionals optionalString; in
 
 stdenv.mkDerivation rec {
-  name = basename + optionalString (cross != null) "-${cross.config}";
+  name = optionalString (cross != null) "${cross.config}-" + basename;
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index bde42e45e9c..f88f761f65a 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -15,7 +15,7 @@ in
 
 # TODO loop over prefixed binaries too
 stdenv.mkDerivation {
-  name = "cctools-binutils-darwin";
+  name = "${prefix}cctools-binutils-darwin";
   buildCommand = ''
     mkdir -p $out/bin $out/include
 
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 204a4789bcc..14c4c6e9973 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -19,7 +19,7 @@ assert (!isDarwin hostPlatform.parsed) -> (maloader != null && xctoolchain != nu
 
 let
   baseParams = rec {
-    name = "cctools-port-${version}";
+    name = "${prefix}cctools-port-${version}";
     version = "895";
 
     src = fetchFromGitHub {