@@ -1,5 +1,4 @@
11{ lib
2−
32, bash
43, binutils-unwrapped
54, coreutils
@@ -27,7 +26,7 @@ rec {
2726 ];
2827 };
2928
30− extract = { name, src }: pkgs.runCommand "${name}-extracted" {
29+ extract = args@{ name ? "${args.pname}-${args.version}", src, ... }: pkgs.runCommand "${name}-extracted" {
3130 buildInputs = [ appimage-exec ];
3231 } ''
3332 appimage-exec.sh -x $out ${src}
@@ -38,7 +37,7 @@ rec {
3837 extractType2 = extract;
3938 wrapType1 = wrapType2;
4039
41− wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv
40+ wrapAppImage = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs, ... }: buildFHSUserEnv
4241 (defaultFhsEnvArgs // {
4342 inherit name;
4443
@@ -46,9 +45,9 @@ rec {
4645 ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
4746
4847 runScript = "appimage-exec.sh -w ${src} --";
49− } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
48+ } // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage)))));
5049
51− wrapType2 = args@{ name, src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
50+ wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
5251 (args // {
5352 inherit name extraPkgs;
5453 src = extract { inherit name src; };