diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-07-29 18:24:00 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-07-29 18:24:00 -0400 |
| commit | 9d59a4df78af3c3d76f84319b40fc654ef186178 (patch) | |
| tree | 81d1d06624a84e42dc63d21e8206a4800b96a8eb | |
| parent | e3a3abe560a143dde4b77176575d02ff32ffebcb (diff) | |
| download | nixpkgs-9d59a4df78af3c3d76f84319b40fc654ef186178.tar nixpkgs-9d59a4df78af3c3d76f84319b40fc654ef186178.tar.gz nixpkgs-9d59a4df78af3c3d76f84319b40fc654ef186178.tar.bz2 nixpkgs-9d59a4df78af3c3d76f84319b40fc654ef186178.tar.lz nixpkgs-9d59a4df78af3c3d76f84319b40fc654ef186178.tar.xz nixpkgs-9d59a4df78af3c3d76f84319b40fc654ef186178.tar.zst nixpkgs-9d59a4df78af3c3d76f84319b40fc654ef186178.zip | |
stdenv/common-path.nix: move to stdenv/generic/
Do this since it is part of the generic stdenv/`mkDerivation` infrastructure, rather than being a bootstrapping strategy.
| -rw-r--r-- | pkgs/misc/my-env/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/common-path.nix (renamed from pkgs/stdenv/common-path.nix) | 0 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/nix/default.nix | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 8a35525b3e8..df4c8fc6b63 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -73,7 +73,7 @@ mkDerivation { }; buildPhase = let - initialPath = import ../../stdenv/common-path.nix { inherit pkgs; }; + initialPath = import ../../stdenv/generic/common-path.nix { inherit pkgs; }; in '' set -x mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin" diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index bbc15bad262..ff56f1de022 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -683,7 +683,7 @@ rec { __stdenvImpureHostDeps = commonImpureHostDeps; __extraImpureHostDeps = commonImpureHostDeps; - initialPath = import ../common-path.nix { inherit pkgs; }; + initialPath = import ../generic/common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; cc = pkgs."${finalLlvmPackages}".libcxxClang; diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/generic/common-path.nix index 8c1acfb50dd..8c1acfb50dd 100644 --- a/pkgs/stdenv/common-path.nix +++ b/pkgs/stdenv/generic/common-path.nix diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 723ebf24fe5..f04d21e1c2f 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -397,7 +397,7 @@ in preHook = commonPreHook; initialPath = - ((import ../common-path.nix) {pkgs = prevStage;}); + ((import ../generic/common-path.nix) {pkgs = prevStage;}); extraNativeBuildInputs = [ prevStage.patchelf ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index 2fb19992bc1..e9e9936ccd8 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -21,7 +21,7 @@ bootStages ++ [ 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 { inherit lib; |