diff options
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | garnix.yaml | 3 | ||||
| -rw-r--r-- | pkgs/modrinth-app/default.nix | 12 |
3 files changed, 9 insertions, 8 deletions
@@ -34,7 +34,7 @@ "aarch64-linux" = requirements."x86_64-linux"; # but not for macos - "aarch64-darwin" = ["modrinth-app"]; + "aarch64-darwin" = []; # garnix also doesn't support intel macs :( "x86_64-darwin" = []; diff --git a/garnix.yaml b/garnix.yaml index a24c2e7..f4b963e 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -1,5 +1,6 @@ builds: - exclude: [] + exclude: + - "*.x86_64-darwin.*" include: - "checks.*.*" - "packages.x86_64-linux.*" diff --git a/pkgs/modrinth-app/default.nix b/pkgs/modrinth-app/default.nix index 66ed193..df5705a 100644 --- a/pkgs/modrinth-app/default.nix +++ b/pkgs/modrinth-app/default.nix @@ -27,13 +27,13 @@ }: rustPlatform.buildRustPackage rec { pname = "modrinth-app"; - version = "unstable-2023-11-21"; + version = "unstable-2023-12-13"; src = fetchFromGitHub { owner = "modrinth"; repo = "theseus"; - rev = "c1518c52f3c99fdc04dd456f8886e73e699f7293"; - sha256 = "sha256-CaYIkJom3XlfdJquS7mUU1FLVXTry+XSMkmpaudBN2M="; + rev = "e39635c75b9ec6abdb07e118dd77e7bb87feac7b"; + sha256 = "sha256-Xr0KG2MtIg4t4TxkMsZO3Nb5/81KzdTUgnSJBbDAa7A="; }; cargoLock = { @@ -93,7 +93,7 @@ rustPlatform.buildRustPackage rec { copyDesktopItems ]; - ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override { + ESBUILD_BINARY_PATH = lib.getExe (esbuild.override { buildGoModule = args: buildGoModule (args // rec { @@ -106,7 +106,7 @@ rustPlatform.buildRustPackage rec { }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); - })}"; + }); preBuild = '' export HOME=$(mktemp -d) @@ -154,6 +154,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://modrinth.com"; license = licenses.gpl3Plus; maintainers = with maintainers; [maintainers.getchoo]; - platforms = with platforms; linux ++ darwin; + platforms = ["x86_64-linux" "x86_64-darwin"]; }; } |