JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #323305 from eclairevoyant/fix-name-for-appimages

Browse Source 
treewide: fix name for appimages
This commit is contained in:
Peder Bergebakken Sundt 2024-06-29 17:07:49 +02:00 committed by GitHub
commit 4a366ec4e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/blockchains/trezor-suite/default.nix
View File

@ -9,7 +9,6 @@
let
pname = "trezor-suite";
version = "24.6.2";
name = "${pname}-${version}";
suffix = {
aarch64-linux = "linux-arm64";
@ -17,7 +16,7 @@ let
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
src = fetchurl {
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
url = "https://github.com/trezor/trezor-suite/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
aarch64-linux = "sha512-fJnka//9DbvTTq7GEN++6thU8f8BL4cHh1J4P/Tu9Eu94KWCHDG2IwFALOXEvZnwLbxFYiu3Cqldp2RIxYFXTA==";
x86_64-linux = "sha512-/gRQR1EriiwrDj04BTnhXlsawJgHp6TqgHpgVCMO1r+U2zGiFLdNfwG/SYwARE+55X8Umls5hCt/wuCpTEPkEg==";
@ -25,16 +24,15 @@ let
};
appimageContents = appimageTools.extractType2 {
inherit name src;
inherit pname version src;
};
in
appimageTools.wrapType2 rec {
inherit name src;
inherit pname version src;
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
mkdir -p $out/bin $out/share/${pname} $out/share/${pname}/resources
cp -a ${appimageContents}/locales/ $out/share/${pname}

7
pkgs/applications/misc/mobilecoin-wallet/default.nix
View File

@ -3,21 +3,18 @@
let
pname = "mobilecoin-wallet";
version = "1.8.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/mobilecoinofficial/desktop-wallet/releases/download/v${version}/MobileCoin.Wallet-${version}.AppImage";
hash = "sha256-XGU/xxsMhOBAh+MeMtL2S707yH8HnoO9w5l7zqjO6rs=";
};
appimageContents = appimageTools.extractType2 { inherit name src; };
appimageContents = appimageTools.extractType2 { inherit pname version src; };
in appimageTools.wrapType2 {
inherit name src;
inherit pname version src;
extraPkgs = pkgs: [ pkgs.libsecret ];
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
mkdir -p $out/share/${pname}
cp -a ${appimageContents}/locales $out/share/${pname}
cp -a ${appimageContents}/resources $out/share/${pname}

8
pkgs/applications/networking/cluster/lens/linux.nix
View File

@ -1,20 +1,16 @@
{ pname, version, src, meta, appimageTools, makeWrapper }:
let
name = "${pname}-${version}";
appimageContents = appimageTools.extractType2 {
inherit name src;
inherit pname version src;
};
in
appimageTools.wrapType2 {
inherit name src meta;
inherit pname version src meta;
extraInstallCommands =
''
mv $out/bin/${name} $out/bin/${pname}
source "${makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/${pname} \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"

3
pkgs/applications/networking/instant-messengers/beeper/default.nix
View File

@ -11,7 +11,6 @@
let
pname = "beeper";
version = "3.106.2";
name = "${pname}-${version}";
src = fetchurl {
url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.106.2-build-240604xwl5q01pr-x86_64.AppImage";
hash = "sha256-WbAWJJzk58UVmRN3RHmU/V6zPiLWAb7m7hns4gmP55M=";
@ -25,7 +24,7 @@ let
};
in
stdenvNoCC.mkDerivation rec {
inherit name pname version;
inherit pname version;
src = appimage;

2
pkgs/applications/networking/instant-messengers/ripcord/default.nix
View File

@ -14,7 +14,7 @@ mkDerivation rec {
name = "${pname}-${version}.AppImage";
};
in appimageTools.extract {
name = "${pname}-${version}";
inherit pname version;
src = appimage;
};

2
pkgs/applications/networking/pcloud/default.nix
View File

@ -48,7 +48,7 @@ let
};
appimageContents = appimageTools.extractType2 {
name = "${pname}-${version}";
inherit pname version;
src = "${src}/pcloud";
};

3
pkgs/applications/office/super-productivity/default.nix
View File

@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
};
appimageContents = appimageTools.extractType2 {
name = "${pname}-${version}";
inherit src;
inherit pname version src;
};
dontUnpack = true;

3
pkgs/applications/video/freetube/default.nix
View File

@ -12,8 +12,7 @@ stdenv.mkDerivation rec {
passthru.tests = nixosTests.freetube;
appimageContents = appimageTools.extractType2 {
name = "${pname}-${version}";
inherit src;
inherit pname version src;
};
dontUnpack = true;

3
pkgs/by-name/im/immersed-vr/linux.nix
View File

@ -4,7 +4,6 @@
, meta
, appimageTools
}:
appimageTools.wrapType2 rec {
appimageTools.wrapType2 {
inherit pname version src meta;
name = "${pname}-${version}";
}

6
pkgs/by-name/wo/wowup-cf/package.nix
View File

@ -3,19 +3,17 @@
let
version = "2.12.0";
pname = "wowup-cf";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage";
hash = "sha256-uWz/EQBX/d1UBfpc9EL4x+UH72kINd6pqFIvJkV16e8=";
};
appimageContents = appimageTools.extractType1 { inherit name src; };
appimageContents = appimageTools.extractType1 { inherit pname version src; };
in appimageTools.wrapType1 {
inherit name src;
inherit pname version src;
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'

3
pkgs/os-specific/linux/uhk-agent/default.nix
View File

@ -21,8 +21,7 @@ let
};
appimageContents = appimageTools.extract {
name = "${pname}-${version}";
inherit src;
inherit pname version src;
};
in
stdenvNoCC.mkDerivation {