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

fix bad --add-flags invocations

Browse Source 
makeBinaryWrapper was updated some months ago to apply shell-style parsing to --add-flags; thats not what you want most of the time
This commit is contained in:
Colin
2025-07-28 06:17:27 +00:00
parent 49d4a79d87
commit 713a85b3d3
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/common/programs/avahi.nix
View File

@@ -22,7 +22,7 @@ in
# do this here, because the nixos service isn't so easily patched. # do this here, because the nixos service isn't so easily patched.
postInstall = (upstream.postInstall or "") + '' postInstall = (upstream.postInstall or "") + ''
wrapProgram "$out/sbin/avahi-daemon" \ wrapProgram "$out/sbin/avahi-daemon" \
--add-flags --no-drop-root --add-flag --no-drop-root
''; '';
nativeBuildInputs = upstream.nativeBuildInputs ++ [ nativeBuildInputs = upstream.nativeBuildInputs ++ [
pkgs.makeBinaryWrapper pkgs.makeBinaryWrapper

2
hosts/common/programs/s6-rc.nix
View File

@@ -11,7 +11,7 @@
postInstall = (upstream.postInstall or "") + '' postInstall = (upstream.postInstall or "") + ''
for prog in s6-rc s6-rc-bundle s6-rc-db s6-rc-format-upgrade s6-rc-init s6-rc-update; do for prog in s6-rc s6-rc-bundle s6-rc-db s6-rc-format-upgrade s6-rc-init s6-rc-update; do
wrapProgram "$bin/bin/$prog" \ wrapProgram "$bin/bin/$prog" \
--add-flags '-l' --add-flags '$XDG_RUNTIME_DIR/s6/live' --add-flag '-l' --add-flags '$XDG_RUNTIME_DIR/s6/live'
done done
''; '';
}); });

2
hosts/common/programs/tor-browser.nix
View File

@@ -5,7 +5,7 @@
# add `--allow-remote` flag so that i can do `tor-browser http://...` to open in an existing instance. # add `--allow-remote` flag so that i can do `tor-browser http://...` to open in an existing instance.
preBuild = (upstream.preBuild or "") + '' preBuild = (upstream.preBuild or "") + ''
makeWrapper() { makeWrapper() {
makeShellWrapper "$@" --add-flags --allow-remote makeShellWrapper "$@" --add-flag --allow-remote
} }
''; '';
}); });

4
modules/programs/make-sandboxed.nix
View File

@@ -112,8 +112,8 @@ let
makeBinaryWrapper ${bunpen'} "$_dir/$_name" \ makeBinaryWrapper ${bunpen'} "$_dir/$_name" \
--suffix PATH : /run/current-system/sw/libexec/${bunpen.pname} \ --suffix PATH : /run/current-system/sw/libexec/${bunpen.pname} \
--inherit-argv0 \ --inherit-argv0 \
${lib.escapeShellArgs (lib.flatten (builtins.map (f: [ "--add-flags" f ]) extraSandboxArgs))} \ ${lib.escapeShellArgs (lib.flatten (builtins.map (f: [ "--add-flag" f ]) extraSandboxArgs))} \
--add-flags "$_dir/.sandboxed/$_name" --add-flag "$_dir/.sandboxed/$_name"
} }
derefWhileInSameOutput() { derefWhileInSameOutput() {

2
pkgs/by-name/signal-desktop-from-src/package.nix
View File

@@ -431,7 +431,7 @@ stdenv.mkDerivation (finalAttrs: {
makeShellWrapper $out/lib/signal-desktop/signal-desktop $out/bin/signal-desktop \ makeShellWrapper $out/lib/signal-desktop/signal-desktop $out/bin/signal-desktop \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
--suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \
--add-flags --ozone-platform-hint=auto \ --add-flag --ozone-platform-hint=auto \
--add-flags "\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}" \ --add-flags "\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}" \
--inherit-argv0 --inherit-argv0
''; '';

2
pkgs/by-name/sxmo-suspend/package.nix
View File

@@ -4,7 +4,7 @@ static-nix-shell.mkPython3 {
pname = "sxmo_suspend.sh"; pname = "sxmo_suspend.sh";
srcRoot = ./.; srcRoot = ./.;
pkgs = [ "rtl8723cs-wowlan" "util-linux" ]; pkgs = [ "rtl8723cs-wowlan" "util-linux" ];
extraMakeWrapperArgs = [ "--add-flags" "--verbose" ]; extraMakeWrapperArgs = [ "--add-flag" "--verbose" ];
} }