diff --git a/_sources/generated.json b/_sources/generated.json index 37fb647..6c37f93 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,4 +1,19 @@ { + "krunker": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "krunker", + "passthru": null, + "pinned": false, + "src": { + "name": null, + "sha256": "sha256-yG8E3a6AaX0TBK23TlBBLmiCfqzS8FldTfl7As4Dcvo=", + "type": "url", + "url": "https://client2.krunker.io/setup.AppImage" + }, + "version": "1626868370902057" + }, "sobercookie": { "cargoLocks": null, "date": "2024-09-08", diff --git a/_sources/generated.nix b/_sources/generated.nix index 28b3d93..4f62fee 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -1,6 +1,14 @@ # This file was generated by nvfetcher, please do not modify it manually. { fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { + krunker = { + pname = "krunker"; + version = "1626868370902057"; + src = fetchurl { + url = "https://client2.krunker.io/setup.AppImage"; + sha256 = "sha256-yG8E3a6AaX0TBK23TlBBLmiCfqzS8FldTfl7As4Dcvo="; + }; + }; sobercookie = { pname = "sobercookie"; version = "0e082ab538a2eed206ab228ed50c5251323abdf2"; diff --git a/nvfetcher.toml b/nvfetcher.toml index c51339b..766ed90 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -1,3 +1,7 @@ [sobercookie] src.git = "https://github.com/xunuwu/sobercookie" fetch.github = "xunuwu/sobercookie" + +[krunker] +src.cmd = "curl -I -s -o /dev/null -w '%header{x-goog-generation}' 'https://client2.krunker.io/setup.AppImage'" +fetch.url = "https://client2.krunker.io/setup.AppImage" diff --git a/pkgs/default.nix b/pkgs/default.nix index 16b2328..c29c1cf 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,5 +6,5 @@ in { pince = pkgs.callPackage ./pince {}; binaryninja-personal = pkgs.qt6Packages.callPackage ./binaryninja-personal {}; sobercookie = pkgs.callPackage ./sobercookie {inherit nv_generated;}; - krunker = pkgs.callPackage ./krunker {}; + krunker = pkgs.callPackage ./krunker {inherit nv_generated;}; } diff --git a/pkgs/krunker/default.nix b/pkgs/krunker/default.nix index df6952a..9885fd6 100644 --- a/pkgs/krunker/default.nix +++ b/pkgs/krunker/default.nix @@ -1,30 +1,24 @@ { appimageTools, - fetchurl, imagemagick, + nv_generated, }: let - # TODO: use https://github.com/KraXen72/crankshaft, can be tracked with nvfetcher - pname = "krunker"; - version = "0.0.1"; - src = fetchurl { - url = "https://client2.krunker.io/setup.AppImage"; - hash = "sha256-yG8E3a6AaX0TBK23TlBBLmiCfqzS8FldTfl7As4Dcvo="; - }; + inherit (nv_generated.krunker) pname src version; appimageContents = appimageTools.extract { - inherit pname version src; + inherit pname src version; }; in - appimageTools.wrapType2 { - inherit pname version src; - extraInstallCommands = '' - for i in 16 24 48 64 96 128 256 512; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - ${imagemagick}/bin/convert -background none -resize ''${i}x ${appimageContents}/io.krunker.desktop.png $out/share/icons/hicolor/''${i}x''${i}/apps/io.krunker.desktop.png - done + appimageTools.wrapType2 (nv_generated.krunker + // { + extraInstallCommands = '' + for i in 16 24 48 64 96 128 256 512; do + mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps + ${imagemagick}/bin/convert -background none -resize ''${i}x ${appimageContents}/io.krunker.desktop.png $out/share/icons/hicolor/''${i}x''${i}/apps/io.krunker.desktop.png + done - install -m 444 -D ${appimageContents}/io.krunker.desktop.desktop $out/share/applications/krunker.desktop - substituteInPlace $out/share/applications/krunker.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' \ - --replace 'Name=Official Krunker.io Client' 'Name=Krunker.io' - ''; - } + install -m 444 -D ${appimageContents}/io.krunker.desktop.desktop $out/share/applications/krunker.desktop + substituteInPlace $out/share/applications/krunker.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' \ + --replace 'Name=Official Krunker.io Client' 'Name=Krunker.io' + ''; + })