diff options
| author | Robin Gloster <mail@glob.in> | 2016-02-09 23:37:07 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-02-09 23:37:07 +0000 |
| commit | da9808fe5cd55c827cbf8019ab4896d1cb8f953e (patch) | |
| tree | 26b3026600d77da410b678f9f837cea8bbde962c /pkgs/stdenv | |
| parent | f0e6c6ec0ea23d1d72743e45c59d3618237efd99 (diff) | |
| download | nixlib-da9808fe5cd55c827cbf8019ab4896d1cb8f953e.tar nixlib-da9808fe5cd55c827cbf8019ab4896d1cb8f953e.tar.gz nixlib-da9808fe5cd55c827cbf8019ab4896d1cb8f953e.tar.bz2 nixlib-da9808fe5cd55c827cbf8019ab4896d1cb8f953e.tar.lz nixlib-da9808fe5cd55c827cbf8019ab4896d1cb8f953e.tar.xz nixlib-da9808fe5cd55c827cbf8019ab4896d1cb8f953e.tar.zst nixlib-da9808fe5cd55c827cbf8019ab4896d1cb8f953e.zip | |
Revert "Switch to GCC 5"
This reverts commit 729870467a97382e2252defe4ae3b04765b9451b.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 573e7139aac8..12fc3fed5a5a 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -210,9 +210,14 @@ 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 = pkgs.isl.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; + }; gccPlain = pkgs.gcc.cc.override { - isl = isl; + isl = isl_0_11; + cloog = cloog_0_18_0; }; }; extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; |