Unverified Commit 44a79d04 authored by Hythera's avatar Hythera
Browse files

noriskclient-launcher-unwrapped: 0.6.19 -> 0.6.20 

diff: https://github.com/NoRiskClient/noriskclient-launcher/compare/v0.6.19...v0.6.20
parent 68296308

pkgs/by-name/no/noriskclient-launcher-unwrapped/package.nix

+17 −5
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
  cargo-tauri,

  desktop-file-utils,

  fetchFromGitHub,

  fetchpatch,

  fetchurl,

  fetchYarnDeps,

  glib,

  gtk3,
@@ -18,18 +20,21 @@ 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "noriskclient-launcher-unwrapped";

  version = "0.6.19";

  version = "0.6.20";



  src = fetchFromGitHub {

    owner = "NoRiskClient";

    repo = "noriskclient-launcher";

    tag = "v${finalAttrs.version}";

    hash = "sha256-SHLYCpflIjslCuCPROyuVsIdNIkHWl2BVflgxAz3RYg=";

    hash = "sha256-VChMA6XXKgtytLFOORxnpNnTrunKaIJkFge2Xu4FjG0=";

  };



  yarnOfflineCache = fetchYarnDeps {

    yarnLock = "${finalAttrs.src}/yarn.lock";

    hash = "sha256-tRvtYeOUn3xm7dhLWnzlpS8SK8NVVQAtNgvyiM48X28=";

    yarnLock = fetchurl {

      url = "https://raw.githubusercontent.com/NoRiskClient/noriskclient-launcher/937b275341191552a08757c9b4e5eb7802d54945/yarn.lock";

      hash = "sha256-IqhgDMthwEAd/rzat119Ajaf8p8LgTDEj/KrS2xVFuQ=";

    };

    hash = "sha256-VWl6YqTiBRz85GICFKGwDZRBcITGQdWE7EUzW58wHdY=";

  };



  patches = [
@@ -38,6 +43,13 @@ 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 = ''
@@ -45,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"

  '';



  cargoHash = "sha256-j41whr62i0FlTe/fWoPsMS9kX5aPgCjM9TckeZpnwgw=";

  cargoHash = "sha256-FiM1FuWeGmfZlnKiIImGOsJnKt3qsLqvY6oRUvOSBWM=";



  cargoRoot = "src-tauri";

  buildAndTestSubdir = finalAttrs.cargoRoot;