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

Merge pull request #33374 from dtzWill/update/llvm-5-default

Browse Source 
Update LLVM default 4 -> 5
This commit is contained in:
Daiderd Jordan
2018-02-11 18:29:26 +01:00
committed by GitHub
parent 06a7281d0f 5af41b7a22
commit 69779a5f7e
8 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/zig/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, llvmPackages_5, llvm_5 }:
{ stdenv, fetchFromGitHub, cmake, llvmPackages }:
stdenv.mkDerivation rec {
version = "0.1.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "01yqjyi25f99bfmxxwyh45k7j84z0zg7n9jl8gg0draf96mzdh06";
};
buildInputs = [ cmake llvmPackages_5.clang-unwrapped llvm_5 ];
buildInputs = [ cmake llvmPackages.clang-unwrapped llvmPackages.llvm ];
cmakeFlags = [
"-DZIG_LIBC_INCLUDE_DIR=${stdenv.cc.libc_dev}/include"