git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #143347 from SuperSandro2000/appimage-wrapType2-pname-version
commit31b495592feadb2785279988a2d7db6e2bdd7ed2 authorSandro <sandro.jaeckel@gmail.com> dateFri 29 Oct 2021, 16:42 (5 years ago) parentbefee4485e5501
2 files changed+7−9
compare with master
unifiedsplit
pkgs/applications/video/molotov/default.nix+3−4 pkgs/build-support/appimage/default.nix+4−5
pkgs/applications/video/molotov/default.nix+3−4
@@ -3,17 +3,16 @@
33let
44 pname = "molotov";
55 version = "4.4.0";
6− name = "${pname}-${version}";
76 src = fetchurl {
87 url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage";
98 sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc=";
109 };
11− appimageContents = appimageTools.extractType2 { inherit name src; };
10+ appimageContents = appimageTools.extractType2 { inherit pname version src; };
1211in
1312appimageTools.wrapType2 {
14− inherit name src;
13+ inherit pname version src;
1514 extraInstallCommands = ''
16− mv $out/bin/${name} $out/bin/${pname}
15+ mv $out/bin/${pname}-${version} $out/bin/${pname}
1716 install -m 444 -D \
1817 ${appimageContents}/@molotovdesktop-wrapper.desktop \
1918 $out/share/applications/${pname}.desktop
pkgs/build-support/appimage/default.nix+4−5
@@ -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; };