diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
commit | 741bf840dad05cd1728481045466811ae8ae8281 (patch) | |
tree | 93ce9aef00773772dfb9b782f20e20b79f024d48 /pkgs/stdenv | |
parent | fe195af94462a6769f2e2c38c1d5739337c20d57 (diff) | |
download | nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.gz nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2 nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.lz nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.xz nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.zst nixlib-741bf840dad05cd1728481045466811ae8ae8281.zip |
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
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 2436181aa7ad..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_0_14 = pkgs.isl_0_14.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_0_14; + isl = isl_0_11; + cloog = cloog_0_18_0; }; }; extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; |