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

libclc: use clang-4

Browse Source
This commit is contained in:
Daiderd Jordan 2018-02-12 20:40:18 +01:00
parent cd121fd3c9
commit 81674e04f3
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/libclc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python2, llvm_4, clang }:
{ stdenv, fetchFromGitHub, python, llvm, clang }:
stdenv.mkDerivation {
name = "libclc-2017-02-25";
@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s";
};
buildInputs = [ python2 llvm_4 clang ];
nativeBuildInputs = [ python ];
buildInputs = [ llvm ];
postPatch = ''
sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py
@ -18,7 +19,7 @@ stdenv.mkDerivation {
'';
configurePhase = ''
${python2.interpreter} ./configure.py --prefix=$out
${python.interpreter} ./configure.py --prefix=$out
'';
meta = with stdenv.lib; {

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

@ -9336,7 +9336,9 @@ with pkgs;
libchop = callPackage ../development/libraries/libchop { };
libclc = callPackage ../development/libraries/libclc { };
libclc = callPackage ../development/libraries/libclc {
inherit (llvmPackages_4) clang llvm;
};
libcli = callPackage ../development/libraries/libcli { };