diff --git a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix index a059db197398..2c7352df28df 100644 --- a/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix +++ b/pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix @@ -2,8 +2,6 @@ cargo-tauri, desktop-file-utils, fetchFromGitHub, - fetchpatch, - fetchurl, fetchYarnDeps, glib, gtk3, @@ -20,20 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "noriskclient-launcher-unwrapped"; - version = "0.6.20"; + version = "0.6.21"; src = fetchFromGitHub { owner = "NoRiskClient"; repo = "noriskclient-launcher"; tag = "v${finalAttrs.version}"; - hash = "sha256-VChMA6XXKgtytLFOORxnpNnTrunKaIJkFge2Xu4FjG0="; + hash = "sha256-RiKFSKHnyeiIcSaOltr4qv0pEBX5wctfztZ+8yrHjnE="; }; yarnOfflineCache = fetchYarnDeps { - yarnLock = fetchurl { - url = "https://raw.githubusercontent.com/NoRiskClient/noriskclient-launcher/937b275341191552a08757c9b4e5eb7802d54945/yarn.lock"; - hash = "sha256-IqhgDMthwEAd/rzat119Ajaf8p8LgTDEj/KrS2xVFuQ="; - }; + yarnLock = "${finalAttrs.src}/yarn.lock"; hash = "sha256-VWl6YqTiBRz85GICFKGwDZRBcITGQdWE7EUzW58wHdY="; }; @@ -43,13 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: { # Make the launcher find java from PATH, instead of downloading its own, which is not going to work on NixOS. ./java-from-path.patch - - # The version of tauri in Cargo.toml and in package.json aren't matching, causing the build to fail. Upstream PR is https://github.com/NoRiskClient/noriskclient-launcher/pull/222. - (fetchpatch { - name = "fix-tauri-version-mismatch"; - url = "https://github.com/NoRiskClient/noriskclient-launcher/commit/937b275341191552a08757c9b4e5eb7802d54945.patch"; - hash = "sha256-jI0KnvUpSJU739BfZeYFMhtZKjno1UrWWGwMLS3I6ag="; - }) ]; postPatch = ''