Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4a11ce7f2613
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0e8177ad1096
Choose a head ref
  • 5 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 20, 2019

  1. appimage-run: add usage message

    @timokau
    timokau committed Apr 20, 2019
    Copy the full SHA
    6af25fd View commit details

  2. appimage-run: pass arguments to appimage

    @timokau
    timokau committed Apr 20, 2019
    Copy the full SHA
    19e075b View commit details

  3. appimage-run: add missing libs

    @timokau
    timokau committed Apr 20, 2019
    Copy the full SHA
    fb6bc78 View commit details

  4. appimage-run: add libtool 

    Needed by Synfigstudio, see
https://github.com/NixOS/nixpkgs/pull/57169/files#issuecomment-477697665.
    @timokau
    timokau committed Apr 20, 2019
    Copy the full SHA
    4f956e8 View commit details

  5. Merge pull request #57169 from timokau/appimage-improvements 

    appimage-run improvements
    @timokau
    timokau authored Apr 20, 2019
    Copy the full SHA
    0e8177a View commit details
Showing with 22 additions and 1 deletion.
  1. +13 −0 pkgs/build-support/appimage/default.nix
  2. +9 −1 pkgs/tools/package-management/appimage-run/default.nix
13 changes: 13 additions & 0 deletions pkgs/build-support/appimage/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
];
};
}
10 changes: 9 additions & 1 deletion pkgs/tools/package-management/appimage-run/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 "$@"
'';
})