diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index ef7da72fda93ef..6db626464fb7f1 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -75,6 +75,8 @@ rec { krb5 ]; + # list of libraries expected in an appimage environment: + # https://github.com/AppImage/pkg2appimage/blob/master/excludelist multiPkgs = pkgs: with pkgs; [ desktop-file-utils xorg.libXcomposite @@ -171,6 +173,17 @@ rec { xorg.libXft libvdpau alsaLib + + harfbuzz + e2fsprogs + libgpgerror + keyutils.lib + libjack2 + fribidi + + # libraries not on the upstream include list, but nevertheless expected + # by at least one appimage + libtool.lib # for Synfigstudio ]; }; } diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 49fe307667af55..54abfa89991a37 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -10,7 +10,15 @@ in buildFHSUserEnv (fhsArgs // { runScript = writeScript "appimage-exec" '' #!${runtimeShell} + if [ $# -eq 0 ]; then + echo "Usage: $0 FILE [OPTION...]" + echo + echo 'Options are passed on to the appimage.' + echo "If you want to execute a custom command in the appimage's environment, set the APPIMAGE_DEBUG_EXEC environment variable." + exit 1 + fi APPIMAGE="$(realpath "$1")" + shift if [ ! -x "$APPIMAGE" ]; then echo "fatal: $APPIMAGE is not executable" @@ -43,6 +51,6 @@ in buildFHSUserEnv (fhsArgs // { exec "$APPIMAGE_DEBUG_EXEC" fi - exec ./AppRun + exec ./AppRun "$@" ''; })