summary refs log tree commit diff
path: root/pkgs/build-support/appimage
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2019-02-12 22:31:35 -0600
committerWill Dietz <w@wdtz.org>2019-04-23 20:40:53 -0500
commitfb771b072a9049237fd8f9df198c6d3b0bfffa69 (patch)
tree45a66e74a622e82306ee71af0e705178f56d7c84 /pkgs/build-support/appimage
parent6088a4793f2a83921b197a9185034934fcd96d02 (diff)
downloadnixpkgs-fb771b072a9049237fd8f9df198c6d3b0bfffa69.tar
nixpkgs-fb771b072a9049237fd8f9df198c6d3b0bfffa69.tar.gz
nixpkgs-fb771b072a9049237fd8f9df198c6d3b0bfffa69.tar.bz2
nixpkgs-fb771b072a9049237fd8f9df198c6d3b0bfffa69.tar.lz
nixpkgs-fb771b072a9049237fd8f9df198c6d3b0bfffa69.tar.xz
nixpkgs-fb771b072a9049237fd8f9df198c6d3b0bfffa69.tar.zst
nixpkgs-fb771b072a9049237fd8f9df198c6d3b0bfffa69.zip
appimage: plumb support for extra attributes to be specified
Diffstat (limited to 'pkgs/build-support/appimage')
-rw-r--r--pkgs/build-support/appimage/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 6db626464fb..82f67d8450f 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -33,7 +33,7 @@ rec {
     '';
   };
 
-  wrapAppImage = { name, src, extraPkgs }: buildFHSUserEnv (defaultFhsEnvArgs // {
+  wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {
     inherit name;
 
     targetPkgs = pkgs: defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
@@ -46,17 +46,17 @@ rec {
       cd $APPDIR
       exec ./AppRun "$@"
     '';
-  });
+  } // (builtins.removeAttrs args [ "name" "src" "extraPkgs" ]));
 
-  wrapType1 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage {
+  wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
     inherit name extraPkgs;
     src = extractType1 { inherit name src; };
-  };
+  });
 
-  wrapType2 = args@{ name, src, extraPkgs ? pkgs: [] }: wrapAppImage {
+  wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
     inherit name extraPkgs;
     src = extractType2 { inherit name src; };
-  };
+  });
 
   defaultFhsEnvArgs = {
     name = "appimage-env";