From 340d601e84baac9482a5f9c97d1aa0d8faa6b8f7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 10 Dec 2023 12:02:58 +0100 Subject: [PATCH] appimage: avoid setting `name` --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ pkgs/build-support/appimage/default.nix | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index aafc1cd53616..a1d7d3b8350d 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -490,6 +490,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The initrd ssh daemon module got a new option to add authorized keys via a list of files using `boot.initrd.network.ssh.authorizedKeyFiles`. +- `appimage`, `appimageTools.wrapAppImage` and `buildFHSEnvBubblewrap` now properly accepts `pname` and `version`. + - Programs written in [Nim](https://nim-lang.org/) are built with libraries selected by lockfiles. The `nimPackages` and `nim2Packages` sets have been removed. See https://nixos.org/manual/nixpkgs/unstable#nim for more information. diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 1c668967c4b1..95dc7ffd1cd6 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -39,15 +39,12 @@ rec { wrapType1 = wrapType2; wrapAppImage = args@{ - name ? "${args.pname}-${args.version}", src, extraPkgs, meta ? {}, ... }: buildFHSEnv (defaultFhsEnvArgs // { - inherit name; - targetPkgs = pkgs: [ appimage-exec ] ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; @@ -58,10 +55,10 @@ rec { } // meta; } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); - wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage + wrapType2 = args@{ src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage (args // { - inherit name extraPkgs; - src = extract { inherit name src; }; + inherit extraPkgs; + src = extract (lib.filterAttrs (key: value: builtins.elem key [ "name" "pname" "version" "src" ]) args); # passthru src to make nix-update work # hack to keep the origin position (unsafeGetAttrPos) @@ -73,8 +70,6 @@ rec { }); defaultFhsEnvArgs = { - name = "appimage-env"; - # Most of the packages were taken from the Steam chroot targetPkgs = pkgs: with pkgs; [ gtk3