From c17aeb0c1acfa05ca1ae8b51151cd5d07e4be7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 14 Feb 2020 17:07:46 +0100 Subject: [PATCH] Merge #62890: libclc: 2017-11-29 -> 2019-06-09 (unbreak) (cherry picked from commit ed77cf1c5670a091a1d5853863b53fd6c09a854a) --- pkgs/development/libraries/libclc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 119adcb4ef2b..4cea2df7816b 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -3,23 +3,24 @@ let llvm = llvmPackages.llvm; clang = llvmPackages.clang; + clang-unwrapped = llvmPackages.clang-unwrapped; in stdenv.mkDerivation { - name = "libclc-2017-11-29"; + name = "libclc-2019-06-09"; src = fetchFromGitHub { owner = "llvm-mirror"; repo = "libclc"; - rev = "d6384415ab854c68777dd77451aa2bc0d959da99"; - sha256 = "10fqrlnqlknh58x7pfsbg9r07fblfg2mgq2m4fr1jbb836ncn3wh"; + rev = "9f6204ec04a8cadb6bef57caa71e3161c4f398f2"; + sha256 = "03l9frx3iw3qdsb9rrscgzdwm6872gv6mkssvn027ndf9y321xk7"; }; nativeBuildInputs = [ python ]; - buildInputs = [ llvm clang ]; + buildInputs = [ llvm clang clang-unwrapped ]; 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 ''; @@ -32,6 +33,5 @@ stdenv.mkDerivation { description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; platforms = platforms.all; - broken = true; }; }