git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108427 from symphorien/chdir-appimage

appimage-run: fix #108426

commit7f355dcc4ee4beb9f3ba6a4bd9a3f353069fe58d authorGuillaume Girol <symphorien@users.noreply.github.com> dateMon 25 Jan 2021, 18:18 (6 years ago) parent7a5e4b7f54f718
4 files changed+35−4
pkgs/build-support/appimage/appimage-exec.sh+2−2 pkgs/tools/package-management/appimage-run/default.nix+3−1 pkgs/tools/package-management/appimage-run/test.nix+24 pkgs/top-level/all-packages.nix+6−1
pkgs/build-support/appimage/appimage-exec.sh+2−2
@@ -75,15 +75,15 @@ apprun() {
7575
7676wrap() {
7777
78− cd "$APPDIR" || exit
7978 # quite same in appimageTools
8079 export APPIMAGE_SILENT_INSTALL=1
8180
8281 if [ -n "$APPIMAGE_DEBUG_EXEC" ]; then
82+ cd "$APPDIR" || true
8383 exec "$APPIMAGE_DEBUG_EXEC"
8484 fi
8585
86− exec ./AppRun "$@"
86+ exec "$APPDIR/AppRun" "$@"
8787}
8888
8989usage() {
pkgs/tools/package-management/appimage-run/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [] }:
1+{ appimageTools, buildFHSUserEnv, extraPkgs ? pkgs: [], appimage-run-tests ? null }:
22
33let
44 fhsArgs = appimageTools.defaultFhsEnvArgs;
@@ -8,4 +8,6 @@ in buildFHSUserEnv (fhsArgs // {
88 targetPkgs = pkgs: [ appimageTools.appimage-exec ]
99 ++ fhsArgs.targetPkgs pkgs ++ extraPkgs pkgs;
1010 runScript = "appimage-exec.sh";
11+
12+ passthru.tests.appimage-run = appimage-run-tests;
1113})
pkgs/tools/package-management/appimage-run/test.nixnew file+24
@@ -0,0 +1,24 @@
1+{ runCommand, fetchurl, appimage-run, glibcLocales, file }:
2+let
3+ # any AppImage usable on cli, really
4+ sample-appImage = fetchurl {
5+ url = "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage";
6+ sha256 = "04ws94q71bwskmhizhwmaf41ma4wabvfgjgkagr8wf3vakgv866r";
7+ };
8+in
9+ runCommand "appimage-run-tests" {
10+ buildInputs = [ appimage-run glibcLocales file ];
11+ meta.platforms = [ "x86_64-linux" ];
12+ }
13+ ''
14+ export HOME=$(mktemp -d)
15+ set -x
16+ # regression test for #101137, must come first
17+ LANG=fr_FR appimage-run ${sample-appImage} --list ${sample-appImage}
18+ # regression test for #108426
19+ cp ${sample-appImage} foo.appImage
20+ LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage
21+ set +x
22+ touch $out
23+ ''
24+
pkgs/top-level/all-packages.nix+6−1
@@ -884,7 +884,12 @@ in
884884 inherit (androidenv.androidPkgs_9_0) build-tools;
885885 };
886886
887− appimage-run = callPackage ../tools/package-management/appimage-run {};
887+ appimage-run = callPackage ../tools/package-management/appimage-run { };
888+ appimage-run-tests = callPackage ../tools/package-management/appimage-run/test.nix {
889+ appimage-run = appimage-run.override {
890+ appimage-run-tests = null; /* break boostrap cycle for passthru.tests */
891+ };
892+ };
888893
889894 appimagekit = callPackage ../tools/package-management/appimagekit {};
890895