From 1c7091f1c195099b9c7ecedabb4193c706f2cfb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jun 2026 03:16:40 +0000 Subject: [PATCH 1/3] xaos: 4.3.4 -> 4.3.5 (cherry picked from commit c0176b0fc4b9532965e9756cd274a5bc8c60151e) --- pkgs/by-name/xa/xaos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xa/xaos/package.nix b/pkgs/by-name/xa/xaos/package.nix index 40f9172eef24..554b4576c030 100644 --- a/pkgs/by-name/xa/xaos/package.nix +++ b/pkgs/by-name/xa/xaos/package.nix @@ -11,7 +11,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "xaos"; - version = "4.3.4"; + version = "4.3.5"; outputs = [ "out" "man" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "xaos-project"; repo = "XaoS"; tag = "release-${finalAttrs.version}"; - hash = "sha256-vOFwZbdbcrcJLHUa1QzxzadPcx5GF5uNPg+MZ7NbAPc="; + hash = "sha256-dGfmX55bm2BCFl7mRit88ULAcJ0VP15yVGI7nhRH0Ig="; }; nativeBuildInputs = [ From 77de5b3346dd2ad6217c6d77847aeed5a751fd50 Mon Sep 17 00:00:00 2001 From: coolcuber Date: Wed, 17 Jun 2026 13:43:48 -0400 Subject: [PATCH 2/3] xaos: add coolcuber as maintainer (cherry picked from commit a161f4aa5a4cd0087a614c0412bd78f62978969d) --- pkgs/by-name/xa/xaos/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/xa/xaos/package.nix b/pkgs/by-name/xa/xaos/package.nix index 554b4576c030..ff631444d357 100644 --- a/pkgs/by-name/xa/xaos/package.nix +++ b/pkgs/by-name/xa/xaos/package.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://xaos-project.github.io/"; license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ coolcuber ]; }; }) From 954ea237fc342c8dc5c3d78999ad0791a7f9f014 Mon Sep 17 00:00:00 2001 From: coolcuber Date: Tue, 30 Jun 2026 23:27:03 -0400 Subject: [PATCH 3/3] xaos: add support for darwin, aarch64-linux (cherry picked from commit edb5548f797e9c6dec5fffc973e4da90ba218175) --- pkgs/by-name/xa/xaos/package.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/xa/xaos/package.nix b/pkgs/by-name/xa/xaos/package.nix index ff631444d357..23541c81ea66 100644 --- a/pkgs/by-name/xa/xaos/package.nix +++ b/pkgs/by-name/xa/xaos/package.nix @@ -45,23 +45,21 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/include/config.h \ --replace-fail "/usr/share/XaoS" "${datapath}" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace XaoS.pro \ + --replace-fail \ + "QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64" \ + "QMAKE_APPLE_DEVICE_ARCHS = ${if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64"}" ''; desktopItems = [ "xdg/xaos.desktop" ]; - installPhase = '' - runHook preInstall - - install -D bin/xaos "$out/bin/xaos" - + postInstall = '' mkdir -p "${datapath}" cp -r tutorial examples catalogs "${datapath}" - install -D "xdg/xaos.png" "$out/share/icons/xaos.png" - install -D doc/xaos.6 "$man/man6/xaos.6" - - runHook postInstall ''; meta = finalAttrs.src.meta // { @@ -69,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "xaos"; homepage = "https://xaos-project.github.io/"; license = lib.licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ coolcuber ]; }; })