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

stdenv/common-path.nix: move to stdenv/generic/

Browse Source 
Do this since it is part of the generic stdenv/`mkDerivation`
infrastructure, rather than being a bootstrapping strategy.
This commit is contained in:
John Ericson 2022-07-29 18:24:00 -04:00
parent e3a3abe560
commit 9d59a4df78
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/misc/my-env/default.nix
View File

@ -73,7 +73,7 @@ mkDerivation {
}; };
buildPhase = let buildPhase = let
initialPath = import ../../stdenv/common-path.nix { inherit pkgs; }; initialPath = import ../../stdenv/generic/common-path.nix { inherit pkgs; };
in '' in ''
set -x set -x
mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin" mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin"

2
pkgs/stdenv/darwin/default.nix
View File

@ -683,7 +683,7 @@ rec {
__stdenvImpureHostDeps = commonImpureHostDeps; __stdenvImpureHostDeps = commonImpureHostDeps;
__extraImpureHostDeps = commonImpureHostDeps; __extraImpureHostDeps = commonImpureHostDeps;
initialPath = import ../common-path.nix { inherit pkgs; }; initialPath = import ../generic/common-path.nix { inherit pkgs; };
shell = "${pkgs.bash}/bin/bash"; shell = "${pkgs.bash}/bin/bash";
cc = pkgs."${finalLlvmPackages}".libcxxClang; cc = pkgs."${finalLlvmPackages}".libcxxClang;

0
pkgs/stdenv/common-path.nix → pkgs/stdenv/generic/common-path.nix
View File

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

@ -397,7 +397,7 @@ in
preHook = commonPreHook; preHook = commonPreHook;
initialPath = initialPath =
((import ../common-path.nix) {pkgs = prevStage;}); ((import ../generic/common-path.nix) {pkgs = prevStage;});
extraNativeBuildInputs = [ prevStage.patchelf ] ++ extraNativeBuildInputs = [ prevStage.patchelf ] ++
# Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.

2
pkgs/stdenv/nix/default.nix
View File

@ -21,7 +21,7 @@ bootStages ++ [
export NIX_IGNORE_LD_THROUGH_GCC=1 export NIX_IGNORE_LD_THROUGH_GCC=1
''; '';
initialPath = (import ../common-path.nix) { pkgs = prevStage; }; initialPath = (import ../generic/common-path.nix) { pkgs = prevStage; };
cc = import ../../build-support/cc-wrapper { cc = import ../../build-support/cc-wrapper {
inherit lib; inherit lib;