diff options
author | Will Dietz <github@wdtz.org> | 2018-07-05 09:22:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-05 09:22:32 -0500 |
commit | eecbb632fd1010366cb65d28370b2bf873d661dc (patch) | |
tree | e4a689334fd501c538cd872aae0c434068fbf52f | |
parent | c120f693677acf4c7ed893db7db133d3c1b4a03b (diff) | |
parent | 405d3f3e6aec43eda8b14065423f9841fb40b59c (diff) | |
download | nixlib-eecbb632fd1010366cb65d28370b2bf873d661dc.tar nixlib-eecbb632fd1010366cb65d28370b2bf873d661dc.tar.gz nixlib-eecbb632fd1010366cb65d28370b2bf873d661dc.tar.bz2 nixlib-eecbb632fd1010366cb65d28370b2bf873d661dc.tar.lz nixlib-eecbb632fd1010366cb65d28370b2bf873d661dc.tar.xz nixlib-eecbb632fd1010366cb65d28370b2bf873d661dc.tar.zst nixlib-eecbb632fd1010366cb65d28370b2bf873d661dc.zip |
Merge pull request #42977 from dtzWill/feature/ispc-llvm-6
ispc: llvm_4 -> llvm_6, fix luxcorerender
-rw-r--r-- | pkgs/development/compilers/ispc/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/6/llvm.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/luxcorerender/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 0fe9c8d3765f..7aedf191abee 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, +{stdenv, fetchFromGitHub, fetchpatch, bash, which, m4, python, bison, flex, llvmPackages, testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: @@ -32,6 +32,13 @@ stdenv.mkDerivation rec { llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped ]; + patches = [ + (fetchpatch { + url = https://github.com/ispc/ispc/commit/d504641f5af9d5992e7c8f0ed42c1063a39ede5b.patch; + sha256 = "192q3gyvam79469bmlwf0jpfi2y4f8hl2vgcvjngsqhvscwira0s"; + }) + ]; + postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile"; # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 86c58eaad4ef..6fc448574f43 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -80,6 +80,8 @@ in stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" + + "-DLLVM_ENABLE_DUMP=ON" ] ++ stdenv.lib.optional enableSharedLibraries "-DLLVM_LINK_LLVM_DYLIB=ON" diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 387c8c0595e7..3611356627a2 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -10,6 +10,7 @@ let boost_static = boost165.override { python = python35; enableStatic = true; + enablePython = true; }; in stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfa2a3b66967..ac3a5a2b5ed9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9711,8 +9711,8 @@ with pkgs; isocodes = callPackage ../development/libraries/iso-codes { }; ispc = callPackage ../development/compilers/ispc { - llvmPackages = llvmPackages_4; - stdenv = llvmPackages_4.stdenv; + llvmPackages = llvmPackages_6; + stdenv = llvmPackages_6.stdenv; }; isso = callPackage ../servers/isso { }; |