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

* Move top-level/stdenvs.nix to the stdenv/ directory.

Browse Source 
svn path=/nixpkgs/branches/usability/; revision=4774
This commit is contained in:
Eelco Dolstra 2006-02-09 15:55:20 +00:00
parent 6f2a205e87
commit 29c64c6c67
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/top-level/stdenvs.nix → pkgs/stdenv/default.nix
View File

@ -10,11 +10,11 @@
rec { rec {
gccWrapper = import ../build-support/gcc-wrapper; gccWrapper = import ../build-support/gcc-wrapper;
genericStdenv = import ../stdenv/generic; genericStdenv = import ./generic;
# Trivial environment used for building other environments. # Trivial environment used for building other environments.
stdenvInitial = (import ../stdenv/initial) { stdenvInitial = (import ./initial) {
name = "stdenv-initial"; name = "stdenv-initial";
inherit system; inherit system;
}; };
@ -25,7 +25,7 @@ rec {
# i.e., the stuff in /bin, /usr/bin, etc. This environment should # i.e., the stuff in /bin, /usr/bin, etc. This environment should
# be used with care, since many Nix packages will not build properly # be used with care, since many Nix packages will not build properly
# with it (e.g., because they require GNU Make). # with it (e.g., because they require GNU Make).
stdenvNative = (import ../stdenv/native) { stdenvNative = (import ./native) {
stdenv = stdenvInitial; stdenv = stdenvInitial;
inherit genericStdenv gccWrapper; inherit genericStdenv gccWrapper;
}; };
@ -37,7 +37,7 @@ rec {
# The Nix build environment. # The Nix build environment.
stdenvNix = (import ../stdenv/nix) { stdenvNix = (import ./nix) {
stdenv = stdenvNative; stdenv = stdenvNative;
pkgs = stdenvNativePkgs; pkgs = stdenvNativePkgs;
inherit genericStdenv gccWrapper; inherit genericStdenv gccWrapper;
@ -50,13 +50,13 @@ rec {
# Linux standard environment. # Linux standard environment.
inherit (import ../stdenv/linux {inherit allPackages;}) inherit (import ./linux {inherit allPackages;})
stdenvLinux stdenvLinuxPkgs; stdenvLinux stdenvLinuxPkgs;
# Darwin (Mac OS X) standard environment. Very simple for now # Darwin (Mac OS X) standard environment. Very simple for now
# (essentially it's just the native environment). # (essentially it's just the native environment).
stdenvDarwin = (import ../stdenv/darwin) { stdenvDarwin = (import ./darwin) {
stdenv = stdenvInitial; stdenv = stdenvInitial;
inherit genericStdenv gccWrapper; inherit genericStdenv gccWrapper;
}; };
@ -70,7 +70,7 @@ rec {
# FreeBSD standard environment. Right now this is more or less the # FreeBSD standard environment. Right now this is more or less the
# same as the native environemnt. Eventually we'll want a pure # same as the native environemnt. Eventually we'll want a pure
# environment similar to stdenvLinux. # environment similar to stdenvLinux.
stdenvFreeBSD = (import ../stdenv/freebsd) { stdenvFreeBSD = (import ./freebsd) {
stdenv = stdenvInitial; stdenv = stdenvInitial;
inherit genericStdenv gccWrapper; inherit genericStdenv gccWrapper;
}; };

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

@ -42,7 +42,7 @@ rec {
stdenv = if bootStdenv == null then defaultStdenv else bootStdenv; stdenv = if bootStdenv == null then defaultStdenv else bootStdenv;
defaultStdenv = defaultStdenv =
(import ./stdenvs.nix { (import ../stdenv {
inherit system; inherit system;
allPackages = import ./all-packages.nix; allPackages = import ./all-packages.nix;
}).stdenv; }).stdenv;