summary refs log tree commit diff
path: root/pkgs/build-support/appimage/default.nix
diff options
context:
space:
mode:
authorAnders Kaseorg <andersk@mit.edu>2021-07-01 17:08:24 -0700
committerAnders Kaseorg <andersk@mit.edu>2021-07-01 17:16:10 -0700
commitb5160bba86e7a47573dde96c779dffa0526d9858 (patch)
tree91d70b6c60599aebf5ef552afcea024b0ed61081 /pkgs/build-support/appimage/default.nix
parent3a8d7958a610cd3fec3a6f424480f91a1b259185 (diff)
downloadnixpkgs-b5160bba86e7a47573dde96c779dffa0526d9858.tar
nixpkgs-b5160bba86e7a47573dde96c779dffa0526d9858.tar.gz
nixpkgs-b5160bba86e7a47573dde96c779dffa0526d9858.tar.bz2
nixpkgs-b5160bba86e7a47573dde96c779dffa0526d9858.tar.lz
nixpkgs-b5160bba86e7a47573dde96c779dffa0526d9858.tar.xz
nixpkgs-b5160bba86e7a47573dde96c779dffa0526d9858.tar.zst
nixpkgs-b5160bba86e7a47573dde96c779dffa0526d9858.zip
appimageTools.wrapAppImage: Fix passing arguments to wrapped executable
appimage-exec.sh parses its arguments with getopts, so we need to
delimit arguments intended for the wrapped executable with ‘--’, in
case some of them begin with ‘-’.

Without this fix, a wrapped application like Zulip Desktop can’t be
opened the normal way using the .desktop file, which includes
‘Exec=zulip --no-sandbox %U’ (as per the electron-builder default):

$ gtk-launch zulip.desktop
/usr/bin/appimage-exec.sh: illegal option -- -
Usage: appimage-run [appimage-run options] <AppImage> [AppImage options]
[…]

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/build-support/appimage/default.nix')
-rw-r--r--pkgs/build-support/appimage/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 6ba5890885d..a759726eb10 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -45,7 +45,7 @@ rec {
       targetPkgs = pkgs: [ appimage-exec ]
         ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
 
-      runScript = "appimage-exec.sh -w ${src}";
+      runScript = "appimage-exec.sh -w ${src} --";
     } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
 
   wrapType2 = args@{ name, src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage