cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #291193 from SuperSamus/itch-update

Browse source 
itch: 26.1.2 -> 26.1.3
This commit is contained in:
Nick Cao 2024-02-26 10:31:36 -05:00 committed by GitHub
commit 56a90c720d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
pkgs/games/itch/butler.nix → pkgs/by-name/bu/butler/package.nix
View file

29
pkgs/games/itch/default.nix → pkgs/by-name/it/itch/package.nix
View file

@ -11,27 +11,27 @@
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "itch"; pname = "itch";
version = "26.1.2"; version = "26.1.3";
# TODO: Using kitch instead of itch, revert when possible # TODO: Using kitch instead of itch, revert when possible
src = fetchzip { src = fetchzip {
url = "https://broth.itch.ovh/k${pname}/linux-amd64/${version}/archive/default#.zip"; url = "https://broth.itch.ovh/kitch/linux-amd64/${version}/archive/default#.zip";
stripRoot = false; stripRoot = false;
sha256 = "sha256-thXe+glpltSiKNGIRgvOZQZPJWfDHWo3dLdziyp2BM4="; hash = "sha256-FHwbzLPMzIpyg6KyYTq6/rSNRH76dytwb9D5f9vNKkU=";
}; };
itch-setup = fetchzip { itch-setup = fetchzip {
url = "https://broth.itch.ovh/itch-setup/linux-amd64/1.26.0/itch-setup.zip"; url = "https://broth.itch.ovh/itch-setup/linux-amd64/1.26.0/itch-setup.zip";
stripRoot = false; stripRoot = false;
sha256 = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; hash = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA=";
}; };
icons = let sparseCheckout = "/release/images/itch-icons"; in icons = let sparseCheckout = "/release/images/itch-icons"; in
fetchFromGitHub { fetchFromGitHub {
owner = "itchio"; owner = "itchio";
repo = pname; repo = "itch";
rev = "v${version}-canary"; rev = "v${version}-canary";
sha256 = "sha256-veZiKs9qHge+gCEpJ119bAT56ssXJAH3HBcYkEHqBFg="; hash = "sha256-0AMyDZ5oI7/pSvudoEqXnMZJtpcKVlUSR6YVm+s4xv0=";
sparseCheckout = [ sparseCheckout ]; sparseCheckout = [ sparseCheckout ];
} + sparseCheckout; } + sparseCheckout;
@ -39,11 +39,11 @@ stdenvNoCC.mkDerivation rec {
desktopItems = [ desktopItems = [
(makeDesktopItem { (makeDesktopItem {
name = pname; name = "itch";
exec = "itch %U"; exec = "itch %U";
tryExec = pname; tryExec = "itch";
icon = pname; icon = "itch";
desktopName = pname; desktopName = "itch";
mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ];
comment = "Install and play itch.io games easily"; comment = "Install and play itch.io games easily";
categories = [ "Game" ]; categories = [ "Game" ];
@ -58,8 +58,8 @@ stdenvNoCC.mkDerivation rec {
substituteInPlace ./resources/app/package.json \ substituteInPlace ./resources/app/package.json \
--replace "kitch" "itch" --replace "kitch" "itch"
mkdir -p $out/bin $out/share/${pname}/resources/app mkdir -p $out/bin $out/share/itch/resources/app
cp -r resources/app "$out/share/${pname}/resources/" cp -r resources/app "$out/share/itch/resources/"
install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/"
install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/"
@ -76,9 +76,9 @@ stdenvNoCC.mkDerivation rec {
''; '';
postFixup = '' postFixup = ''
makeWrapper ${steam-run}/bin/steam-run $out/bin/${pname} \ makeWrapper ${steam-run}/bin/steam-run $out/bin/itch \
--add-flags ${electron}/bin/electron \ --add-flags ${electron}/bin/electron \
--add-flags $out/share/${pname}/resources/app \ --add-flags $out/share/itch/resources/app \
--set BROTH_USE_LOCAL butler,itch-setup \ --set BROTH_USE_LOCAL butler,itch-setup \
--prefix PATH : ${butler}/bin/:${itch-setup} --prefix PATH : ${butler}/bin/:${itch-setup}
''; '';
@ -90,5 +90,6 @@ stdenvNoCC.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
maintainers = with maintainers; [ pasqui23 ]; maintainers = with maintainers; [ pasqui23 ];
mainProgram = "itch";
}; };
} }

4
pkgs/top-level/all-packages.nix
View file

@ -1732,7 +1732,7 @@ with pkgs;
btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { }; btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { };
butler = callPackage ../games/itch/butler.nix { butler = callPackage ../by-name/bu/butler/package.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
buildGoModule = buildGo120Module; buildGoModule = buildGo120Module;
}; };
@ -3977,8 +3977,6 @@ with pkgs;
ipp-usb = callPackage ../os-specific/linux/ipp-usb { }; ipp-usb = callPackage ../os-specific/linux/ipp-usb { };
itch = callPackage ../games/itch { };
itchiodl = callPackage ../games/itchiodl { }; itchiodl = callPackage ../games/itchiodl { };
itd = callPackage ../applications/misc/itd { }; itd = callPackage ../applications/misc/itd { };