pyrox.dev
lol
Merge pull request #143347 from SuperSandro2000/appimage-wrapType2-pname-version
+3
-4
pkgs/applications/video/molotov/default.nix
+3
-4
pkgs/applications/video/molotov/default.nix
···
3
3
let
4
4
pname = "molotov";
5
5
version = "4.4.0";
6
-
name = "${pname}-${version}";
7
6
src = fetchurl {
8
7
url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage";
9
8
sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc=";
10
9
};
11
-
appimageContents = appimageTools.extractType2 { inherit name src; };
10
+
appimageContents = appimageTools.extractType2 { inherit pname version src; };
12
11
in
13
12
appimageTools.wrapType2 {
14
-
inherit name src;
13
+
inherit pname version src;
15
14
extraInstallCommands = ''
16
-
mv $out/bin/${name} $out/bin/${pname}
15
+
mv $out/bin/${pname}-${version} $out/bin/${pname}
17
16
install -m 444 -D \
18
17
${appimageContents}/@molotovdesktop-wrapper.desktop \
19
18
$out/share/applications/${pname}.desktop
+4
-5
pkgs/build-support/appimage/default.nix
+4
-5
pkgs/build-support/appimage/default.nix
···
1
1
{ lib
2
-
3
2
, bash
4
3
, binutils-unwrapped
5
4
, coreutils
···
27
26
];
28
27
};
29
28
30
-
extract = { name, src }: pkgs.runCommand "${name}-extracted" {
29
+
extract = args@{ name ? "${args.pname}-${args.version}", src, ... }: pkgs.runCommand "${name}-extracted" {
31
30
buildInputs = [ appimage-exec ];
32
31
} ''
33
32
appimage-exec.sh -x $out ${src}
···
38
37
extractType2 = extract;
39
38
wrapType1 = wrapType2;
40
39
41
-
wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv
40
+
wrapAppImage = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs, ... }: buildFHSUserEnv
42
41
(defaultFhsEnvArgs // {
43
42
inherit name;
44
43
···
46
45
++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;
47
46
48
47
runScript = "appimage-exec.sh -w ${src} --";
49
-
} // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
48
+
} // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage)))));
50
49
51
-
wrapType2 = args@{ name, src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
50
+
wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage
52
51
(args // {
53
52
inherit name extraPkgs;
54
53
src = extract { inherit name src; };