From 515d3439b3a8369241d62a7952e67d85159644c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Fri, 23 Aug 2024 23:16:16 +0200 Subject: [PATCH 1/2] pixelorama: 1.0.1 -> 1.0.2 https://github.com/Orama-Interactive/Pixelorama/releases/tag/v1.0.2 --- pkgs/by-name/pi/pixelorama/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix index dfe9abf9632f..16f0a3ed06a3 100644 --- a/pkgs/by-name/pi/pixelorama/package.nix +++ b/pkgs/by-name/pi/pixelorama/package.nix @@ -21,9 +21,9 @@ let preset = if stdenv.isLinux then - if stdenv.is64bit then "Linux/X11 64-bit" else "Linux/X11 32-bit" + if stdenv.is64bit then "Linux 64-bit" else "Linux 32-bit" else if stdenv.isDarwin then - "Mac OSX" + "macOS" else throw "unsupported platform"; @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - hash = "sha256-lfim5ZiykOhI1kgsu0ni2frUVHPRIPJdrGx6TuUQcSY="; + hash = "sha256-rFXUy6fvGKmB+aaNgiI+NNRG0xlj1migdetnU4iVDDQ="; }; strictDeps = true; From 4271b753b2c65d9e943ff3a1c9b5fc826f4750f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Fri, 23 Aug 2024 23:28:35 +0200 Subject: [PATCH 2/2] pixelorama: add aarch64-linux support --- pkgs/by-name/pi/pixelorama/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pi/pixelorama/package.nix b/pkgs/by-name/pi/pixelorama/package.nix index 16f0a3ed06a3..889306ddd673 100644 --- a/pkgs/by-name/pi/pixelorama/package.nix +++ b/pkgs/by-name/pi/pixelorama/package.nix @@ -19,13 +19,14 @@ }: let + presets = { + "i686-linux" = "Linux 32-bit"; + "x86_64-linux" = "Linux 64-bit"; + "aarch64-linux" = "Linux ARM64"; + }; preset = - if stdenv.isLinux then - if stdenv.is64bit then "Linux 64-bit" else "Linux 32-bit" - else if stdenv.isDarwin then - "macOS" - else - throw "unsupported platform"; + presets.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); godot_version_folder = lib.replaceStrings [ "-" ] [ "." ] godot_4.version; in @@ -95,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" + "aarch64-linux" ]; maintainers = with maintainers; [ felschr ]; mainProgram = "pixelorama";