colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

static-nix-shell: more clearly mark the nix-shell preambles

Browse Source
This commit is contained in:
Colin
2025-07-20 20:55:25 +00:00
parent 3b8b227c09
commit 1a89305f18
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/by-name/static-nix-shell/package.nix
View File

@@ -105,13 +105,19 @@ in rec {
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
#^ TODO: each shell should use preBuild to compute a `shellPreamble`
die() { die() {
echo "$@" echo "$@"
exit 1 exit 1
} }
if [ -n "$shellPreamble" ]; then
shellPreamble="
# --- BEGIN: nix-shell preamble (generated code) ---
$shellPreamble
# --- END: nix-shell preamble (generated code) ---
"
fi
substituteInPlace ${srcPath} \ substituteInPlace ${srcPath} \
--replace-fail '#!/usr/bin/env nix-shell' '#!${interpreter}' \ --replace-fail '#!/usr/bin/env nix-shell' '#!${interpreter}' \
--replace-fail \ --replace-fail \
@@ -241,6 +247,7 @@ in rec {
pkgsEnv = [ zsh ] ++ (builtins.attrValues pkgsAsAttrs); pkgsEnv = [ zsh ] ++ (builtins.attrValues pkgsAsAttrs);
pkgExprs = insertTopo "zsh" (builtins.attrNames pkgsAsAttrs); pkgExprs = insertTopo "zsh" (builtins.attrNames pkgsAsAttrs);
in mkShell ({ in mkShell ({
# TODO: generate `shellPreamble` here to reduce wrapping
inherit pkgsEnv pkgExprs; inherit pkgsEnv pkgExprs;
interpreter = lib.getExe zsh; interpreter = lib.getExe zsh;
} // (removeAttrs attrs [ "pkgs" "zsh" ]) } // (removeAttrs attrs [ "pkgs" "zsh" ])
@@ -253,6 +260,7 @@ in rec {
pkgsEnv = builtins.attrValues pkgsAsAttrs; pkgsEnv = builtins.attrValues pkgsAsAttrs;
pkgExprs = insertTopo "python3" (builtins.attrNames pkgsAsAttrs); pkgExprs = insertTopo "python3" (builtins.attrNames pkgsAsAttrs);
in mkShell ({ in mkShell ({
# TODO: generate `shellPreamble` here to reduce wrapping
inherit pkgsEnv pkgExprs; inherit pkgsEnv pkgExprs;
interpreter = lib.getExe python3; interpreter = lib.getExe python3;
interpreterName = "python3"; interpreterName = "python3";