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

static-nix-shell: remove unused extraMakeWrapperArgs argument

Browse Source 
it wasn't even implemented right
This commit is contained in:
Colin
2025-07-20 20:09:50 +00:00
parent fa38f70079
commit 8fc16eaf39
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,6 @@ in rec {
pkgExprs, pkgExprs,
srcPath ? pname, srcPath ? pname,
srcRoot ? null, srcRoot ? null,
extraMakeWrapperArgs ? [],
... ...
}@attrs: }@attrs:
let let
@@ -150,10 +149,9 @@ in rec {
# ensure that there weren't some trailing deps we *didn't* substitute # ensure that there weren't some trailing deps we *didn't* substitute
grep '^# nix deps evaluated statically$' $out/bin/${srcPath} || die 'trailing characters in nix-shell directive for ${srcPath}' grep '^# nix deps evaluated statically$' $out/bin/${srcPath} || die 'trailing characters in nix-shell directive for ${srcPath}'
if [[ ''${#makeWrapperArgs[@]} != 0 || ''${#extraMakeWrapperArgs[@]} ]]; then if [[ ''${#makeWrapperArgs[@]} != 0 ]]; then
wrapProgram $out/bin/${srcPath} \ wrapProgram $out/bin/${srcPath} \
"''${makeWrapperArgs[@]}" \ "''${makeWrapperArgs[@]}"
"''${extraMakeWrapperArgs[@]}"
fi fi
runHook postInstall runHook postInstall
@@ -173,7 +171,6 @@ in rec {
mainProgram = srcPath; mainProgram = srcPath;
} // (attrs.meta or {}); } // (attrs.meta or {});
} // extraDerivArgs // (removeAttrs attrs [ } // extraDerivArgs // (removeAttrs attrs [
"extraMakeWrapperArgs"
"interpreter" "interpreter"
"interpreterName" "interpreterName"
"meta" "meta"