From 88850c19abec707c550a0456d02793db180cd736 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Feb 2018 19:49:51 -0600 Subject: [PATCH 1/2] swift: add include for (#35689) --- pkgs/development/compilers/swift/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 360f96e1242..0f221715748 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -145,7 +145,6 @@ let url = "https://github.com/apple/swift-llbuild/commit/303a89bc6da606c115560921a452686aa0655f5e.diff"; sha256 = "04sw7ym1grzggj1v3xrzr2ljxz8rf9rnn9n5fg1xjbwlrdagkc7m"; }; - in stdenv.mkDerivation rec { name = "swift-${version_friendly}"; @@ -247,6 +246,9 @@ stdenv.mkDerivation rec { # https://bugs.swift.org/browse/SR-5779 sed -i -e 's|"-latomic"|"-Wl,-rpath,${clang.cc.gcc.lib}/lib" "-L${clang.cc.gcc.lib}/lib" "-latomic"|' swift/cmake/modules/AddSwift.cmake + # https://bugs.swift.org/browse/SR-4838 + sed -i -e '30i#include ' lldb/include/lldb/Utility/TaskPool.h + substituteInPlace clang/lib/Driver/ToolChains.cpp \ --replace ' addPathIfExists(D, SysRoot + "/usr/lib", Paths);' \ ' addPathIfExists(D, SysRoot + "/usr/lib", Paths); addPathIfExists(D, "${glibc}/lib", Paths);' From 4a9c3633ddaa2e7e9ce3fd1d17bf545b10bbd7f1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 26 Feb 2018 21:01:29 -0600 Subject: [PATCH 2/2] swift: fix broken ar symlink --- pkgs/development/compilers/swift/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 0f221715748..fc142a4026b 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -289,7 +289,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 ${targetPackages.stdenv.cc.bintools}/bin/ar $out/bin/ar + ln -s ${targetPackages.stdenv.cc.bintools.bintools_bin}/bin/ar $out/bin/ar wrapProgram $out/bin/swift \ --suffix C_INCLUDE_PATH : $out/lib/swift/clang/include \