about summary refs log tree commit diff
path: root/pkgs/build-support/appimage/default.nix
diff options
context:
space:
mode:
authorPeder Bergebakken Sundt <pbsds@hotmail.com>2023-12-10 12:02:58 +0100
committerPeder Bergebakken Sundt <pbsds@hotmail.com>2024-04-24 15:26:52 +0200
commit340d601e84baac9482a5f9c97d1aa0d8faa6b8f7 (patch)
tree453da16e02718403c4426f7b2b3240a73e9b2845 /pkgs/build-support/appimage/default.nix
parent90622c10bd12fc55c17b528ff4e2394a701aa8a3 (diff)
appimage: avoid setting `name`
Diffstat (limited to 'pkgs/build-support/appimage/default.nix')
-rw-r--r--pkgs/build-support/appimage/default.nix11
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 1c668967c4b17..95dc7ffd1cd66 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