diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 14:45:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 15:23:13 +0200 |
| commit | f361938b210e057906dcdd5471275ddf265e4a4e (patch) | |
| tree | ea69e01503464f511e388d36fe69c3c689b42fbc /pkgs/stdenv | |
| parent | f2cb132c34d115761a19728a2a6a595f4fa08761 (diff) | |
| parent | b233ecdca68e08940024da6e4e55e6ef2a20863f (diff) | |
| download | nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.gz nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.bz2 nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.lz nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.xz nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.tar.zst nixlib-f361938b210e057906dcdd5471275ddf265e4a4e.zip | |
Merge staging into closure-size
This makes gcc5 the default builder, etc.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 822be1a52df6..5696797a9567 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -210,14 +210,9 @@ rec { gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; libmpc = pkgs.libmpc.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - isl_0_11 = pkgs.isl_0_11.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; - cloog_0_18_0 = pkgs.cloog_0_18_0.override { - stdenv = pkgs.makeStaticLibraries pkgs.stdenv; - isl = isl_0_11; - }; + isl_0_14 = pkgs.isl_0_14.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; gccPlain = pkgs.gcc.cc.override { - isl = isl_0_11; - cloog = cloog_0_18_0; + isl = isl_0_14; }; }; extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; |