Merge #62890: libclc: 2017-11-29 -> 2019-06-09 (unbreak)
This commit is contained in:
commit
ed77cf1c56
1 changed files with 6 additions and 6 deletions
|
@ -3,23 +3,24 @@
|
||||||
let
|
let
|
||||||
llvm = llvmPackages.llvm;
|
llvm = llvmPackages.llvm;
|
||||||
clang = llvmPackages.clang;
|
clang = llvmPackages.clang;
|
||||||
|
clang-unwrapped = llvmPackages.clang-unwrapped;
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "libclc-2017-11-29";
|
name = "libclc-2019-06-09";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "llvm-mirror";
|
owner = "llvm-mirror";
|
||||||
repo = "libclc";
|
repo = "libclc";
|
||||||
rev = "d6384415ab854c68777dd77451aa2bc0d959da99";
|
rev = "9f6204ec04a8cadb6bef57caa71e3161c4f398f2";
|
||||||
sha256 = "10fqrlnqlknh58x7pfsbg9r07fblfg2mgq2m4fr1jbb836ncn3wh";
|
sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ python ];
|
nativeBuildInputs = [ python ];
|
||||||
buildInputs = [ llvm clang ];
|
buildInputs = [ llvm clang clang-unwrapped ];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py
|
sed -i 's,llvm_clang =.*,llvm_clang = "${clang-unwrapped}/bin/clang",' configure.py
|
||||||
sed -i 's,cxx_compiler =.*,cxx_compiler = "${clang}/bin/clang++",' configure.py
|
sed -i 's,cxx_compiler =.*,cxx_compiler = "${clang}/bin/clang++",' configure.py
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -32,6 +33,5 @@ stdenv.mkDerivation {
|
||||||
description = "Implementation of the library requirements of the OpenCL C programming language";
|
description = "Implementation of the library requirements of the OpenCL C programming language";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
broken = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue