diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-10-18 14:05:39 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-11-05 17:10:53 -0500 |
| commit | 4d4f94cde4d3806ca063ebf7e6ba448b0feae355 (patch) | |
| tree | ab5b2aa5e33137b0832999a9a15d6740855c963f /pkgs/development/compilers/swift | |
| parent | 70d91badf57bbe4cd884e5da22b14662dd36009c (diff) | |
| download | nixlib-4d4f94cde4d3806ca063ebf7e6ba448b0feae355.tar nixlib-4d4f94cde4d3806ca063ebf7e6ba448b0feae355.tar.gz nixlib-4d4f94cde4d3806ca063ebf7e6ba448b0feae355.tar.bz2 nixlib-4d4f94cde4d3806ca063ebf7e6ba448b0feae355.tar.lz nixlib-4d4f94cde4d3806ca063ebf7e6ba448b0feae355.tar.xz nixlib-4d4f94cde4d3806ca063ebf7e6ba448b0feae355.tar.zst nixlib-4d4f94cde4d3806ca063ebf7e6ba448b0feae355.zip | |
treewide: Depend on targetPackages.stdenv.cc.bintools instead of binutils directly
One should do this when needed executables at run time. It is more honest and cross-friendly than refering to binutils directly, if one neeeds the default binary tools for the target platform, rather than binutils in particular.
Diffstat (limited to 'pkgs/development/compilers/swift')
| -rw-r--r-- | pkgs/development/compilers/swift/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 7484d2568be9..937977b0a97d 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -1,4 +1,5 @@ { stdenv +, targetPackages , cmake , coreutils , glibc @@ -26,7 +27,6 @@ , rsync , git , libgit2 -, binutils , fetchFromGitHub , paxctl , findutils @@ -250,7 +250,7 @@ stdenv.mkDerivation rec { # TODO: Use wrappers to get these on the PATH for swift tools, instead ln -s ${clang}/bin/* $out/bin/ - ln -s ${binutils}/bin/ar $out/bin/ar + ln -s ${targetPackages.stdenv.cc.bintools}/bin/ar $out/bin/ar ''; # Hack to avoid TMPDIR in RPATHs. |