File tree Expand file tree Collapse file tree 2 files changed +22
-4
lines changed
Expand file tree Collapse file tree 2 files changed +22
-4
lines changed Original file line number Diff line number Diff line change 3131 ] ;
3232in
3333let
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
Original file line number Diff line number Diff line change 3030 ] ;
3131in
3232let
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
You can’t perform that action at this time.
0 commit comments