From 1c85b7d96eb38b6b953eb08800f372a2eab624b1 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 13 Mar 2025 05:26:14 +0800
Subject: [PATCH] xaos: 4.2.1 -> 4.3.3

---
 pkgs/applications/graphics/xaos/default.nix | 28 ++++++++++-----------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index a337447eaeb5..6dd1c768b85b 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  qt6,
   copyDesktopItems,
 }:
 
@@ -14,7 +11,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "xaos";
-  version = "4.2.1";
+  version = "4.3.3";
   outputs = [
     "out"
     "man"
@@ -22,20 +19,22 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "xaos-project";
-    repo = pname;
-    rev = "release-${version}";
-    hash = "sha256-JLF8Mz/OHZEEJG/aryKQuJ6B5R8hPJdvln7mbKoqXFU=";
+    repo = "XaoS";
+    tag = "release-${version}";
+    hash = "sha256-EUhh1j0OVpCggpKcUJTRJOMKKy3ZF5Fdrk9yuXc2uEY=";
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    qt6.qmake
+    qt6.qttools
+    qt6.wrapQtAppsHook
     copyDesktopItems
   ];
-  buildInputs = [ qtbase ];
+
+  buildInputs = [ qt6.qtbase ];
 
   QMAKE_LRELEASE = "lrelease";
+
   DEFINES = [
     "USE_OPENGL"
     "USE_FLOAT128"
@@ -43,7 +42,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/include/config.h \
-      --replace "/usr/share/XaoS" "${datapath}"
+      --replace-fail "/usr/share/XaoS" "${datapath}"
   '';
 
   desktopItems = [ "xdg/xaos.desktop" ];
@@ -56,9 +55,10 @@ stdenv.mkDerivation rec {
     mkdir -p "${datapath}"
     cp -r tutorial examples catalogs "${datapath}"
 
-    install -D "xdg/${pname}.png" "$out/share/icons/${pname}.png"
+    install -D "xdg/xaos.png" "$out/share/icons/xaos.png"
 
     install -D doc/xaos.6 "$man/man6/xaos.6"
+
     runHook postInstall
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 378ef7094719..8999568370a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15620,7 +15620,7 @@ with pkgs;
 
   x32edit = callPackage ../applications/audio/midas/x32edit.nix { };
 
-  xaos = libsForQt5.callPackage ../applications/graphics/xaos { };
+  xaos = callPackage ../applications/graphics/xaos { };
 
   xbindkeys-config = callPackage ../tools/X11/xbindkeys-config {
     gtk = gtk2;