From c0cdf0ad4bac64d96bd7c581878d4507c53234c8 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 29 Nov 2022 12:00:00 +0000 Subject: [PATCH] appimage-run: export OWD documented here: https://docs.appimage.org/packaging-guide/environment-variables.html Fixes #203330 --- pkgs/build-support/appimage/appimage-exec.sh | 3 +++ pkgs/tools/package-management/appimage-run/test.nix | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index 4ff6802e645..b91d13c4a23 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -7,6 +7,9 @@ fi PATH="@path@:$PATH" apprun_opt=true +OWD=$(readlink -f .) +# can be read by appimages: https://docs.appimage.org/packaging-guide/environment-variables.html +export OWD # src : AppImage # dest : let's unpack() create the directory diff --git a/pkgs/tools/package-management/appimage-run/test.nix b/pkgs/tools/package-management/appimage-run/test.nix index c9bc63c08a8..34c5ab77726 100644 --- a/pkgs/tools/package-management/appimage-run/test.nix +++ b/pkgs/tools/package-management/appimage-run/test.nix @@ -5,6 +5,10 @@ let url = "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage"; sha256 = "04ws94q71bwskmhizhwmaf41ma4wabvfgjgkagr8wf3vakgv866r"; }; + owdtest = fetchurl { + url = "https://github.com/NixOS/nixpkgs/files/10099048/owdtest.AppImage.gz"; + sha256 = "sha256-EEp9dxz/+l5XkNaVBFgv5v64sizQILnljRAzwXv/yV8="; + }; in runCommand "appimage-run-tests" { buildInputs = [ appimage-run glibcLocales file ]; @@ -18,6 +22,9 @@ in # regression test for #108426 cp ${sample-appImage} foo.appImage LANG=fr_FR appimage-run ${sample-appImage} --list foo.appImage + cp ${owdtest} owdtest.AppImage.gz + gunzip owdtest.AppImage.gz + appimage-run owdtest.AppImage set +x touch $out ''