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

Merge pull request #183967 from Ericson2314/small-stdenv-cleanup

Browse Source 
stdenv: Two small cleanups
This commit is contained in:
Robert Hensing 2022-08-01 14:37:42 +02:00 committed by GitHub
commit 12a060dbbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 26 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;

26
pkgs/stdenv/default.nix
View File

@ -38,28 +38,10 @@ let
in in
if crossSystem != localSystem || crossOverlays != [] then stagesCross if crossSystem != localSystem || crossOverlays != [] then stagesCross
else if config ? replaceStdenv then stagesCustom else if config ? replaceStdenv then stagesCustom
else { # switch else if localSystem.isLinux then stagesLinux
i686-linux = stagesLinux; else if localSystem.isDarwin then stagesDarwin
x86_64-linux = stagesLinux; else # misc special cases
armv5tel-linux = stagesLinux; { # switch
armv6l-linux = stagesLinux;
armv6m-linux = stagesLinux;
armv7a-linux = stagesLinux;
armv7l-linux = stagesLinux;
armv7r-linux = stagesLinux;
armv7m-linux = stagesLinux;
armv8a-linux = stagesLinux;
armv8r-linux = stagesLinux;
armv8m-linux = stagesLinux;
aarch64-linux = stagesLinux;
mipsel-linux = stagesLinux;
mips64el-linux = stagesLinux;
powerpc-linux = /* stagesLinux */ stagesNative;
powerpc64-linux = stagesLinux;
powerpc64le-linux = stagesLinux;
riscv64-linux = stagesLinux;
x86_64-darwin = stagesDarwin;
aarch64-darwin = stagesDarwin;
x86_64-solaris = stagesNix; x86_64-solaris = stagesNix;
i686-cygwin = stagesNative; i686-cygwin = stagesNative;
x86_64-cygwin = stagesNative; x86_64-cygwin = stagesNative;

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;