diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 08:55:26 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-07-05 08:55:26 +0200 |
| commit | 5328aac7be5b7ebf794349f915a379efd04b018b (patch) | |
| tree | 029547f7673a785c42f12770a68a3ec31a297bf9 /pkgs/os-specific/darwin/binutils/default.nix | |
| parent | f203b32bb8e824a75f89fd9805680b4a8e92d2a5 (diff) | |
| parent | c73f0caea5f0822ea044b4f90de4b64706d91362 (diff) | |
| download | nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.gz nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.bz2 nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.lz nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.xz nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.tar.zst nixlib-5328aac7be5b7ebf794349f915a379efd04b018b.zip | |
Merge branch 'staging'
Comparison looks OK; I'll try some fixes on master directly. http://hydra.nixos.org/eval/1372577?compare=1372497
Diffstat (limited to 'pkgs/os-specific/darwin/binutils/default.nix')
| -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 f88f761f65a3..933e7558dbbf 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; + }; } |