Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

appimage-run improvements #57169

Merged
merged 4 commits into from Apr 20, 2019
Merged

appimage-run improvements #57169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6af25fd
appimage-run: add usage message
timokau Mar 9, 2019
19e075b
appimage-run: pass arguments to appimage
timokau Mar 9, 2019
fb6bc78
appimage-run: add missing libs
timokau Mar 9, 2019
4f956e8
appimage-run: add libtool
timokau Apr 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkgs/build-support/appimage/default.nix
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
];
};
}
10 changes: 9 additions & 1 deletion pkgs/tools/package-management/appimage-run/default.nix
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -43,6 +51,6 @@ in buildFHSUserEnv (fhsArgs // {
exec "$APPIMAGE_DEBUG_EXEC"
fi

exec ./AppRun
exec ./AppRun "$@"
'';
})