summary refs log tree commit diff
path: root/pkgs/development/compilers/llvm
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2017-06-05 12:46:08 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-06-05 12:46:08 +0200
commit757894039289fba029dad19dad8184a7ef670875 (patch)
tree6cb7179c83220f87e7876102c443bb9b248ba63c /pkgs/development/compilers/llvm
parent30f329e74b73644e16d49746cc4bbae93f42ae4b (diff)
parent14413421824a4176bc8a2b29063104796eb0a638 (diff)
downloadnixlib-757894039289fba029dad19dad8184a7ef670875.tar
nixlib-757894039289fba029dad19dad8184a7ef670875.tar.gz
nixlib-757894039289fba029dad19dad8184a7ef670875.tar.bz2
nixlib-757894039289fba029dad19dad8184a7ef670875.tar.lz
nixlib-757894039289fba029dad19dad8184a7ef670875.tar.xz
nixlib-757894039289fba029dad19dad8184a7ef670875.tar.zst
nixlib-757894039289fba029dad19dad8184a7ef670875.zip
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r--pkgs/development/compilers/llvm/4/lldb.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index a71c2332dc1c..a3c46a4c7e94 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -32,17 +32,21 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake python which swig ];
   buildInputs = [ ncurses zlib libedit libxml2 llvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
 
+  cmakeFlags = [
+    "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic
+  ];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
     license     = licenses.ncsa;
-    platforms   = platforms.allBut platforms.darwin;
+    platforms   = platforms.all;
   };
 }