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

Merge branch 'staging'

Browse Source 
There are a few dozen new failures on Darwin, probably related to
updates of stdenv's llvm and/or pkgconfig.
Still the total number of successes increases.
This commit is contained in:
Vladimír Čunát
2017-04-08 10:55:48 +02:00
parent 94214467ff 9ae3f39e8e
commit 26766f0e57
21 changed files with 98 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
{ newScope, stdenv, cmake, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
let
callPackage = newScope (self // { inherit stdenv isl release_version version fetch; });
callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
release_version = "4.0.0";
version = release_version; # differentiating these is important for rc's