From 88a6a433d0388aa02ed85407d5a48d992481e6e1 Mon Sep 17 00:00:00 2001
From: RemuSalminen <remumooses.salminen@gmail.com>
Date: Sun, 7 Jun 2026 12:54:02 +0300
Subject: [PATCH 1/2] maintainers: add mooses

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f86bb07d690f..8d86c558acad 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18493,6 +18493,11 @@
     githubId = 3579600;
     name = "Jacob Moody";
   };
+  mooses = {
+    name = "Remu Salminen";
+    github = "RemuSalminen";
+    githubId = 85031022;
+  };
   moosingin3space = {
     email = "moosingin3space@gmail.com";
     github = "moosingin3space";

From cf4caa0ae2bcc84e505ed8f79aa0343970ba096b Mon Sep 17 00:00:00 2001
From: RemuSalminen <remumooses.salminen@gmail.com>
Date: Sun, 7 Jun 2026 12:57:17 +0300
Subject: [PATCH 2/2] ultrastar-creator: 2019-04-23 -> 1.3.1

Now Uses Qt6. Changelog: https://github.com/UltraStar-Deluxe/UltraStar-Creator/releases/tag/1.3.1

Co-authored-by: Jack Rosenberg <nixos@jackr.eu>
---
 pkgs/tools/misc/ultrastar-creator/default.nix | 102 +++++++++++++-----
 pkgs/top-level/all-packages.nix               |   2 +-
 2 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index 9fabf29831a5..cee19b476b27 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -2,64 +2,108 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
+  qt6,
   pkg-config,
-  wrapQtAppsHook,
   taglib,
+  alsa-lib,
+  pulseaudio,
+  cld2,
   libbass,
   libbass_fx,
+  makeDesktopItem,
 }:
 
-# TODO: get rid of (unfree) libbass
-# issue:https://github.com/UltraStar-Deluxe/UltraStar-Creator/issues/3
-# there’s a WIP branch here:
-# https://github.com/UltraStar-Deluxe/UltraStar-Creator/commits/BASS_removed
-
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ultrastar-creator";
-  version = "2019-04-23";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "UltraStar-Deluxe";
     repo = "UltraStar-Creator";
-    rev = "36583b4e482b68f6aa949e77ef2744776aa587b1";
-    sha256 = "1rzz04l7s7pxj74xam0cxlq569lfpgig35kpbsplq531d4007pc9";
+    tag = finalAttrs.version;
+    hash = "sha256-QWlgMpyNadRh6Tkg1mAtb11mKbk4thE6sCQKiDyR/SA=";
   };
 
   postPatch = ''
-    # we don’t want prebuilt binaries checked into version control!
-    rm -rf lib include
-    sed -e "s|DESTDIR =.*$|DESTDIR = $out/bin|" \
-        -e 's|-L".*unix"||' \
-        -e "/QMAKE_POST_LINK/d" \
-        -e "s|../include/bass|${lib.getLib libbass}/include|g" \
-        -e "s|../include/bass_fx|${lib.getLib libbass_fx}/include|g" \
-        -e "s|../include/taglib|${lib.getLib taglib}/include|g" \
-        -i src/UltraStar-Creator.pro
+    rm -rf lib include/bass include/bass_fx include/cld2
+
+    echo 'const char *revision = "${finalAttrs.version}"; const char *date_time = "unknown";' \
+      > src/version.h
+
+    substituteInPlace src/UltraStar-Creator.pro \
+      --replace-fail 'DESTDIR = ../bin/release' "DESTDIR = $out/bin" \
+      --replace-fail 'DESTDIR = ../bin/debug'   "DESTDIR = $out/bin" \
+      --replace-fail '../include/bass_fx'        '${lib.getLib libbass_fx}/include' \
+      --replace-fail '../include/bass'           '${lib.getLib libbass}/include' \
+      --replace-fail '../include/cld2/public'    '${cld2}/include/cld2/public' \
+      --replace-fail '../include/taglib'         '${lib.getDev taglib}/include'
+
+    sed -i \
+      -e 's|-L"../lib/unix"||' \
+      -e 's|-L"/usr/lib/x86_64-linux-gnu"||' \
+      -e '/QMAKE_POST_LINK/d' \
+      src/UltraStar-Creator.pro
+
+    sed -i \
+      -e '/QMAKE_EXTRA_TARGETS.*revtarget/d' \
+      -e '/PRE_TARGETDEPS.*version\.h/d' \
+      -e '/^revtarget\.target/d' \
+      -e '/^\trevtarget\./d' \
+      -e '/^revtarget\.depends/,/[^\\]$/d' \
+      src/UltraStar-Creator.pro
   '';
 
   preConfigure = ''
     cd src
   '';
 
-  nativeBuildInputs = [
-    qmake
-    pkg-config
-    wrapQtAppsHook
+  qtWrapperArgs = [
+    "--prefix LD_LIBRARY_PATH : ${
+      lib.makeLibraryPath [
+        alsa-lib
+        pulseaudio
+      ]
+    }"
   ];
+
+  nativeBuildInputs = [
+    pkg-config
+    qt6.qmake
+    qt6.wrapQtAppsHook
+  ];
+
   buildInputs = [
-    qtbase
-    taglib
+    cld2
     libbass
     libbass_fx
+    qt6.qtbase
+    taglib
+    alsa-lib
+    pulseaudio
   ];
 
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 ../setup/unix/UltraStar-Creator.png $out/share/icons/hicolor/128x128/apps/ultrastar-creator.png
+    ln -s "$desktopItem/share/applications" "$out/share/"
+
+    runHook postInstall
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = finalAttrs.pname;
+    desktopName = "UltraStar-Creator";
+    exec = "UltraStar-Creator";
+    icon = "ultrastar-creator";
+  };
+
   meta = {
     mainProgram = "UltraStar-Creator";
     description = "Ultrastar karaoke song creation tool";
     homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Creator";
     license = lib.licenses.gpl2Only;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ mooses ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f918116c6fa..ca3e0ffbad0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10526,7 +10526,7 @@ with pkgs;
     ];
   };
 
-  ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { };
+  ultrastar-creator = callPackage ../tools/misc/ultrastar-creator { };
 
   ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };