public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #42977 from dtzWill/feature/ispc-llvm-6

Browse Source 
ispc: llvm_4 -> llvm_6, fix luxcorerender
This commit is contained in:
Will Dietz 2018-07-05 09:22:32 -05:00 committed by GitHub
commit eecbb632fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/ispc/default.nix
View File

@ -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 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 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"; 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 # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real

2
pkgs/development/compilers/llvm/6/llvm.nix
View File

@ -80,6 +80,8 @@ in stdenv.mkDerivation (rec {
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.targetPlatform.config}"
"-DTARGET_TRIPLE=${stdenv.targetPlatform.config}" "-DTARGET_TRIPLE=${stdenv.targetPlatform.config}"
"-DLLVM_ENABLE_DUMP=ON"
] ]
++ stdenv.lib.optional enableSharedLibraries ++ stdenv.lib.optional enableSharedLibraries
"-DLLVM_LINK_LLVM_DYLIB=ON" "-DLLVM_LINK_LLVM_DYLIB=ON"

1
pkgs/tools/graphics/luxcorerender/default.nix
View File

@ -10,6 +10,7 @@
let boost_static = boost165.override { let boost_static = boost165.override {
python = python35; python = python35;
enableStatic = true; enableStatic = true;
enablePython = true;
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {

4
pkgs/top-level/all-packages.nix
View File

@ -9711,8 +9711,8 @@ with pkgs;
isocodes = callPackage ../development/libraries/iso-codes { }; isocodes = callPackage ../development/libraries/iso-codes { };
ispc = callPackage ../development/compilers/ispc { ispc = callPackage ../development/compilers/ispc {
llvmPackages = llvmPackages_4; llvmPackages = llvmPackages_6;
stdenv = llvmPackages_4.stdenv; stdenv = llvmPackages_6.stdenv;
}; };
isso = callPackage ../servers/isso { }; isso = callPackage ../servers/isso { };