diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-26 19:49:51 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-26 20:06:14 -0600 |
| commit | 88850c19abec707c550a0456d02793db180cd736 (patch) | |
| tree | 153381bc61b7a003ffcde342cd620fd2d6147aed /pkgs/development/compilers | |
| parent | 4db787b1b15bfad87ee385def6f5e7618f353135 (diff) | |
| download | nixlib-88850c19abec707c550a0456d02793db180cd736.tar nixlib-88850c19abec707c550a0456d02793db180cd736.tar.gz nixlib-88850c19abec707c550a0456d02793db180cd736.tar.bz2 nixlib-88850c19abec707c550a0456d02793db180cd736.tar.lz nixlib-88850c19abec707c550a0456d02793db180cd736.tar.xz nixlib-88850c19abec707c550a0456d02793db180cd736.tar.zst nixlib-88850c19abec707c550a0456d02793db180cd736.zip | |
swift: add include for <functional> (#35689)
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/swift/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 360f96e12427..0f2217157484 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 <functional>' 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);' |