diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-18 12:01:04 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-18 12:01:04 +0000 |
commit | d01ca839af18af1b563c2a84b58ec479dd980a5f (patch) | |
tree | c75dd8451d8a14d6decd47acbf38f42d0c245f9c /pkgs/tools/package-management | |
parent | 40b1df814015362a5d86832a56dd4c3505ef088b (diff) | |
parent | ae3c6a2eb96909a1c6c66487b67d3dffc5cdaa89 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/appimage-run/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index 286fd9d7ff68b..cf44e665510ed 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -1,4 +1,10 @@ -{ appimageTools, buildFHSEnv, makeDesktopItem, extraPkgs ? pkgs: [], appimage-run-tests ? null }: +{ lib +, appimageTools +, buildFHSEnv +, makeDesktopItem +, extraPkgs ? pkgs: [] +, appimage-run-tests ? null +}: let name = "appimage-run"; @@ -14,7 +20,7 @@ let mimeTypes = ["application/vnd.appimage" "application/x-iso9660-appimage"]; categories = ["PackageManager" "Utility"]; }; -in buildFHSEnv (fhsArgs // { +in buildFHSEnv (lib.recursiveUpdate fhsArgs { inherit name; targetPkgs = pkgs: [ appimageTools.appimage-exec ] @@ -26,4 +32,6 @@ in buildFHSEnv (fhsArgs // { ''; passthru.tests.appimage-run = appimage-run-tests; + + meta.mainProgram = "appimage-run"; }) |