From b5d7392cb1862c7a125d7623fa211eb364736199 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 7 Jun 2024 18:36:58 -0400 Subject: [PATCH] modrinth-app: don't use broken recursion structure https://github.com/NixOS/nixpkgs/issues/312345 --- pkgs/by-name/mo/modrinth-app-unwrapped/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index de85c96eb5a44..31fd7d98189f9 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -5,7 +5,6 @@ rustPlatform, buildGoModule, nix-update-script, - modrinth-app-unwrapped, cargo-tauri, desktop-file-utils, esbuild, @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "modrinth"; repo = "theseus"; - rev = "v${modrinth-app-unwrapped.version}"; + rev = "v${version}"; sha256 = "sha256-JWR0e2vOBvOLosr22Oo2mAlR0KAhL+261RRybhNctlM="; }; @@ -73,7 +72,7 @@ rustPlatform.buildRustPackage rec { Darwin = "app"; } .${stdenv.hostPlatform.uname.system} - or (builtins.throw "No tauri bundle available for ${stdenv.hostPlatform.uname.system}!"); + or (throw "No tauri bundle available for ${stdenv.hostPlatform.uname.system}!"); ESBUILD_BINARY_PATH = lib.getExe ( esbuild.override { @@ -133,14 +132,14 @@ rustPlatform.buildRustPackage rec { A unique, open source launcher that allows you to play your favorite mods, and keep them up to date, all in one neat little package ''; - mainProgram = "modrinth-app"; homepage = "https://modrinth.com"; - changelog = "https://github.com/modrinth/theseus/releases/tag/v${modrinth-app-unwrapped.version}"; + changelog = "https://github.com/modrinth/theseus/releases/tag/v${version}"; license = with lib.licenses; [ gpl3Plus unfreeRedistributable ]; maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "modrinth-app"; platforms = with lib; platforms.linux ++ platforms.darwin; # this builds on architectures like aarch64, but the launcher itself does not support them yet broken = !stdenv.isx86_64;