nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Switch to GCC 5"

Browse Source 
This reverts commit 729870467a.
This commit is contained in:
Robin Gloster 2016-02-09 23:37:07 +00:00
parent f0e6c6ec0e
commit da9808fe5c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/stdenv/linux/default.nix
View File

@ -210,9 +210,14 @@ rec {
gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; gmp = pkgs.gmp.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; }; mpfr = pkgs.mpfr.override { stdenv = pkgs.makeStaticLibraries pkgs.stdenv; };
libmpc = pkgs.libmpc.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 { gccPlain = pkgs.gcc.cc.override {
isl = isl; isl = isl_0_11;
cloog = cloog_0_18_0;
}; };
}; };
extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ]; extraBuildInputs = [ stage2.pkgs.patchelf stage2.pkgs.paxctl ];

4
pkgs/top-level/all-packages.nix
View File

@ -3944,7 +3944,7 @@ let
gambit = callPackage ../development/compilers/gambit { }; gambit = callPackage ../development/compilers/gambit { };
gcc = gcc5; gcc = gcc49;
gcc_multi = gcc_multi =
if system == "x86_64-linux" then lowPrio ( if system == "x86_64-linux" then lowPrio (
@ -4092,7 +4092,7 @@ let
cross = null; cross = null;
libcCross = if crossSystem != null then libcCross else null; libcCross = if crossSystem != null then libcCross else null;
isl = isl_0_15; isl = isl_0_14;
})); }));
gfortran = if !stdenv.isDarwin then gfortran49 gfortran = if !stdenv.isDarwin then gfortran49