2nd approach at getting a check for /niximpure in stdenv-updates

This commit is contained in:
Lluís Batlle i Rossell 2012-12-26 21:38:58 +01:00
parent 1af2ada7d4
commit 635880a17a
4 changed files with 10 additions and 2 deletions

View file

@ -13,6 +13,10 @@ sed -e "s^@initialPath@^$initialPath^g" \
-e "s^@gcc@^$gcc^g" \
-e "s^@shell@^$shell^g" \
< $out/setup > $out/setup.tmp
if [ -n "$withNixImpure" ]; then
sed -i -e 's^@niximpure@^test -f /niximupure/impure.sh && . /niximpure/impure.sh^g' \
$out/setup.tmp
fi
mv $out/setup.tmp $out/setup
# Allow the user to install stdenv using nix-env and get the packages

View file

@ -1,5 +1,6 @@
{ system, name ? "stdenv", preHook ? "", initialPath, gcc, shell
, extraAttrs ? {}, overrides ? (pkgs: {})
, withNixImpure ? false
, # The `fetchurl' to use for downloading curl and its dependencies
# (see all-packages.nix).
@ -26,7 +27,7 @@ let
setup = setupScript;
inherit preHook initialPath gcc shell;
inherit preHook initialPath gcc shell withNixImpure;
propagatedUserEnvPkgs = [gcc] ++
lib.filter lib.isDerivation initialPath;

View file

@ -270,6 +270,7 @@ elif [ "$NIX_BUILD_CORES" -le 0 ]; then
fi
export NIX_BUILD_CORES
@niximpure@
######################################################################
# Misc. helper functions.

View file

@ -264,7 +264,7 @@ rec {
inherit system;
preHook = commonPreHook;
initialPath =
((import ../common-path.nix) {pkgs = stdenvLinuxBoot4Pkgs;})
++ [stdenvLinuxBoot4Pkgs.patchelf];
@ -281,6 +281,8 @@ rec {
shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
fetchurlBoot = fetchurl;
withNixImpure = if platform ? nixImpure then platform.nixImpure else false;
extraAttrs = {
inherit (stdenvLinuxBoot3Pkgs) glibc;