fix bad --add-flags invocations

makeBinaryWrapper was updated some months ago to apply shell-style parsing to --add-flags; thats not what you want most of the time

hosts/common/programs/avahi.nix

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

hosts/common/programs/s6-rc.nix

@@ -11,7 +11,7 @@
       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
           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
       '';
     });

hosts/common/programs/tor-browser.nix

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

modules/programs/make-sandboxed.nix

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

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

@@ -431,7 +431,7 @@ stdenv.mkDerivation (finalAttrs: {
     makeShellWrapper $out/lib/signal-desktop/signal-desktop $out/bin/signal-desktop \
       "''${gappsWrapperArgs[@]}" \
       --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}" \
       --inherit-argv0
   '';

pkgs/by-name/sxmo-suspend/package.nix

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