Skip to content

Commit 140733a

Browse files
committed
fix: stdenv handling
1 parent 0096721 commit 140733a

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

lib/mkDevShell.nix

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,19 @@ let
3131
];
3232
in
3333
let
34-
baseStdenv = if lib.isFunction toolchain.stdenv then toolchain.stdenv pkgs else pkgs.stdenv;
34+
baseStdenv =
35+
if lib.isFunction toolchain.stdenv then
36+
toolchain.stdenv pkgs
37+
else if toolchain ? stdenv then
38+
toolchain.stdenv
39+
else if lib.isFunction stdenv then
40+
stdenv pkgs
41+
else
42+
stdenv;
43+
3544
mkShell = pkgs.mkShell.override {
3645
stdenv =
37-
if pkgs.stdenv.isLinux && config.linker.wild.enable && pkgs ? useWildLinker then
46+
if baseStdenv.isLinux && config.linker.wild.enable && pkgs ? useWildLinker then
3847
pkgs.useWildLinker baseStdenv
3948
else if pkgs.stdenv.isLinux && config.linker.mold.enable && pkgs.stdenvAdapters ? useMoldLinker then
4049
pkgs.stdenvAdapters.useMoldLinker baseStdenv

lib/mkLintShell.nix

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,19 @@ let
3030
];
3131
in
3232
let
33-
baseStdenv = if lib.isFunction toolchain.stdenv then toolchain.stdenv pkgs else pkgs.stdenv;
33+
baseStdenv =
34+
if lib.isFunction toolchain.stdenv then
35+
toolchain.stdenv pkgs
36+
else if toolchain ? stdenv then
37+
toolchain.stdenv
38+
else if lib.isFunction stdenv then
39+
stdenv pkgs
40+
else
41+
stdenv;
42+
3443
mkShell = pkgs.mkShell.override {
3544
stdenv =
36-
if pkgs.stdenv.isLinux && config.linker.wild.enable && pkgs ? useWildLinker then
45+
if baseStdenv.isLinux && config.linker.wild.enable && pkgs ? useWildLinker then
3746
pkgs.useWildLinker baseStdenv
3847
else if pkgs.stdenv.isLinux && config.linker.mold.enable && pkgs.stdenvAdapters ? useMoldLinker then
3948
pkgs.stdenvAdapters.useMoldLinker baseStdenv

0 commit comments

Comments
 (0)