diff options
author | Will Dietz <w@wdtz.org> | 2018-07-03 17:26:59 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-07-05 07:22:53 -0500 |
commit | 72b897ba75210f7351ff4e01cb40667fe3d5f543 (patch) | |
tree | 03cf3b926f8cca2acb0281f2d96c3aa0bb06a9e5 /pkgs/development | |
parent | 39eca29cc07422358ada551f5edea59b42ed11e0 (diff) | |
download | nixlib-72b897ba75210f7351ff4e01cb40667fe3d5f543.tar nixlib-72b897ba75210f7351ff4e01cb40667fe3d5f543.tar.gz nixlib-72b897ba75210f7351ff4e01cb40667fe3d5f543.tar.bz2 nixlib-72b897ba75210f7351ff4e01cb40667fe3d5f543.tar.lz nixlib-72b897ba75210f7351ff4e01cb40667fe3d5f543.tar.xz nixlib-72b897ba75210f7351ff4e01cb40667fe3d5f543.tar.zst nixlib-72b897ba75210f7351ff4e01cb40667fe3d5f543.zip |
ispc: patch w/upstream commit to fix w/llvm 6
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/ispc/default.nix | 9 |
1 files changed, 8 insertions, 1 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 |