diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-29 16:42:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-29 16:42:01 +0200 |
commit | 31b495592feadb2785279988a2d7db6e2bdd7ed2 (patch) | |
tree | e892b6f1a235286b85b965441661559ee91d1805 /pkgs | |
parent | befee44c7708dbbc93e9a5405269cfc70b1fc7ee (diff) | |
parent | 85e55011028b9b4fe914456c8dec8278308040ac (diff) | |
download | nixpkgs-31b495592feadb2785279988a2d7db6e2bdd7ed2.tar nixpkgs-31b495592feadb2785279988a2d7db6e2bdd7ed2.tar.gz nixpkgs-31b495592feadb2785279988a2d7db6e2bdd7ed2.tar.bz2 nixpkgs-31b495592feadb2785279988a2d7db6e2bdd7ed2.tar.lz nixpkgs-31b495592feadb2785279988a2d7db6e2bdd7ed2.tar.xz nixpkgs-31b495592feadb2785279988a2d7db6e2bdd7ed2.tar.zst nixpkgs-31b495592feadb2785279988a2d7db6e2bdd7ed2.zip |
Merge pull request #143347 from SuperSandro2000/appimage-wrapType2-pname-version
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/molotov/default.nix | 7 | ||||
-rw-r--r-- | pkgs/build-support/appimage/default.nix | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/applications/video/molotov/default.nix b/pkgs/applications/video/molotov/default.nix index 3015bc1191b..670eef3aa3e 100644 --- a/pkgs/applications/video/molotov/default.nix +++ b/pkgs/applications/video/molotov/default.nix @@ -3,17 +3,16 @@ let pname = "molotov"; version = "4.4.0"; - name = "${pname}-${version}"; src = fetchurl { url = "http://desktop-auto-upgrade.molotov.tv/linux/${version}/molotov.AppImage"; sha256 = "sha256-l4Il6i8uXSeJqH3ITC8ZUpKXPQb0qcW7SpKx1R46XDc="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname version src; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D \ ${appimageContents}/@molotovdesktop-wrapper.desktop \ $out/share/applications/${pname}.desktop diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 9df241a48ca..8a2b2324574 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -1,5 +1,4 @@ { lib - , bash , binutils-unwrapped , coreutils @@ -27,7 +26,7 @@ rec { ]; }; - extract = { name, src }: pkgs.runCommand "${name}-extracted" { + extract = args@{ name ? "${args.pname}-${args.version}", src, ... }: pkgs.runCommand "${name}-extracted" { buildInputs = [ appimage-exec ]; } '' appimage-exec.sh -x $out ${src} @@ -38,7 +37,7 @@ rec { extractType2 = extract; wrapType1 = wrapType2; - wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv + wrapAppImage = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // { inherit name; @@ -46,9 +45,9 @@ rec { ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs; runScript = "appimage-exec.sh -w ${src} --"; - } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage)))); + } // (removeAttrs args ([ "pname" "version" ] ++ (builtins.attrNames (builtins.functionArgs wrapAppImage))))); - wrapType2 = args@{ name, src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage + wrapType2 = args@{ name ? "${args.pname}-${args.version}", src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage (args // { inherit name extraPkgs; src = extract { inherit name src; }; |