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

Merge branch 'staging' into gcc-7

Browse Source
This commit is contained in:
Vladimír Čunát
2017-11-11 19:09:41 +01:00
parent e8bd4102c6 8559b6db82
commit 1862b77b5d
3666 changed files with 70441 additions and 56174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@ let
libc = prevStage.glibc;
inherit (prevStage) binutils coreutils gnugrep;
name = name;
stdenv = prevStage.ccWrapperStdenv;
stdenvNoCC = prevStage.ccWrapperStdenv;
};
extraAttrs = {
@@ -244,7 +244,7 @@ in
};
cc = prevStage.gcc-unwrapped;
libc = self.glibc;
inherit (self) stdenv binutils coreutils gnugrep;
inherit (self) stdenvNoCC binutils coreutils gnugrep;
name = "";
shell = self.bash + "/bin/bash";
};