diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 23:24:55 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 23:24:55 +0100 |
commit | deaef8abaf312723300e1c156346573eedfdb70a (patch) | |
tree | 4c501c007d6648154b10c5df6adaea7e2e121f92 /pkgs/stdenv | |
parent | 0db6ea6f760500d740f49756918c1807e2f48da5 (diff) | |
download | nixlib-deaef8abaf312723300e1c156346573eedfdb70a.tar nixlib-deaef8abaf312723300e1c156346573eedfdb70a.tar.gz nixlib-deaef8abaf312723300e1c156346573eedfdb70a.tar.bz2 nixlib-deaef8abaf312723300e1c156346573eedfdb70a.tar.lz nixlib-deaef8abaf312723300e1c156346573eedfdb70a.tar.xz nixlib-deaef8abaf312723300e1c156346573eedfdb70a.tar.zst nixlib-deaef8abaf312723300e1c156346573eedfdb70a.zip |
Pass ‘config’ to stdenv/generic/default.nix
This is a backport of cf8daf63120adedbeaf5bc8c2f396be2496a741e in stdenv-updates (sans the userHook stuff).
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/default.nix | 7 | ||||
-rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 6 | ||||
-rw-r--r-- | pkgs/stdenv/native/default.nix | 4 | ||||
-rw-r--r-- | pkgs/stdenv/nix/default.nix | 4 |
5 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 8e0da288eec7..67000670cd1b 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -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. diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index bed6ad2f90ee..852be9612fb5 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,5 +1,5 @@ { system, name ? "stdenv", preHook ? "", initialPath, gcc, shell -, extraAttrs ? {}, overrides ? (pkgs: {}) +, extraAttrs ? {}, overrides ? (pkgs: {}), config , # The `fetchurl' to use for downloading curl and its dependencies # (see all-packages.nix). diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 3105e76f8177..777b2cf6a328 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -7,7 +7,7 @@ # The function defaults are for easy testing. { system ? builtins.currentSystem , allPackages ? import ../../top-level/all-packages.nix -, platform ? null }: +, platform ? null, config }: rec { @@ -81,7 +81,7 @@ rec { {gcc, extraAttrs ? {}, overrides ? (pkgs: {}), extraPath ? [], fetchurl}: import ../generic { - inherit system; + inherit system config; name = "stdenv-linux-boot"; preHook = '' @@ -261,7 +261,7 @@ rec { # dependency (`nix-store -qR') on bootstrapTools or the # first binutils built. stdenvLinux = import ../generic rec { - inherit system; + inherit system config; preHook = commonPreHook; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index a33a46c8512d..524b2a53337b 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -1,4 +1,4 @@ -{ system, allPackages ? import ../../.. }: +{ system, allPackages ? import ../../.., config }: rec { @@ -98,7 +98,7 @@ rec { fetchurlBoot = fetchurl; - inherit system shell gcc overrides; + inherit system shell gcc overrides config; }; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 5e242b6e3a1c..668bac5f0ae8 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,6 +1,8 @@ -{ stdenv, pkgs }: +{ stdenv, pkgs, config }: import ../generic rec { + inherit config; + preHook = '' export NIX_ENFORCE_PURITY=1 |