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

Merge branch 'stdenv-updates' into pi-stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/compilers/gcc/4.6/default.nix
	pkgs/development/compilers/gcc/4.7/default.nix

The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
This commit is contained in:
Lluís Batlle i Rossell
2012-12-28 20:14:01 +00:00
parent f2f50c42d2 88b11196c1
commit 719ba63004
417 changed files with 838 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/default.nix
+4 -3
View File
@@ -10,7 +10,7 @@
# system, e.g., cygwin and mingw builds on i686-cygwin. Most people
# can ignore it.
{system, stdenvType ? system, allPackages ? import ../.., platform}:
{ system, stdenvType ? system, allPackages ? import ../.., platform, config }:
assert system != "i686-cygwin" -> system == stdenvType;
@@ -24,7 +24,7 @@ rec {
# be used with care, since many Nix packages will not build properly
# with it (e.g., because they require GNU Make).
stdenvNative = (import ./native {
inherit system allPackages;
inherit system allPackages config;
}).stdenv;
stdenvNativePkgs = allPackages {
@@ -35,13 +35,14 @@ rec {
# The Nix build environment.
stdenvNix = import ./nix {
inherit config;
stdenv = stdenvNative;
pkgs = stdenvNativePkgs;
};
# Linux standard environment.
stdenvLinux = (import ./linux {inherit system allPackages platform;}).stdenvLinux;
stdenvLinux = (import ./linux { inherit system allPackages platform config;}).stdenvLinux;
# MinGW/MSYS standard environment.