diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-23 17:45:27 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-30 10:09:31 -0400 |
| commit | 95c8277701fb746ad4d91841de494ee869886991 (patch) | |
| tree | 120ec8dad2d1a6d1c678f3d51778328f5ad2a110 /pkgs/os-specific/darwin/binutils | |
| parent | d61c22341b00171b53697164cb8241184979d14c (diff) | |
| download | nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.gz nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.bz2 nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.lz nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.xz nixpkgs-95c8277701fb746ad4d91841de494ee869886991.tar.zst nixpkgs-95c8277701fb746ad4d91841de494ee869886991.zip | |
misc pkgs: Remove unneeded *Platform == *Platform comparisons
PR #26007 used these to avoid causing a mass rebuild. Now that we know things work, we do that to clean up.
Diffstat (limited to 'pkgs/os-specific/darwin/binutils')
| -rw-r--r-- | pkgs/os-specific/darwin/binutils/default.nix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index f88f761f65a..933e7558dbb 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -2,11 +2,12 @@ , hostPlatform, targetPlatform }: -let - prefix = stdenv.lib.optionalString - (targetPlatform != hostPlatform) - "${targetPlatform.config}-"; +# Make sure both underlying packages claim to have prepended their binaries +# with the same prefix. +assert binutils-raw.prefix == cctools.prefix; +let + inherit (binutils-raw) prefix; cmds = [ "ar" "ranlib" "as" "dsymutil" "install_name_tool" "ld" "strip" "otool" "lipo" "nm" "strings" "size" @@ -50,4 +51,8 @@ stdenv.mkDerivation { ln -s ${cctools}/libexec $out/libexec ''; + + passthru = { + inherit prefix; + }; } |