Merge pull request #330388 from Tungsten842/jamesdsp-qt6

jamesdsp: build with qt6
NixOS · Jul 27, 2024 · f144fae · f144fae
2 parents ba3a78d + da3d63f
commit f144fae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix
@@ -11,6 +11,7 @@
 , qmake
 , qtbase
 , qtsvg
+, qtwayland
 , stdenv
 , usePipewire ? true
 , usePulseaudio ? false
@@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     libarchive
     qtbase
     qtsvg
+    qtwayland
   ] ++ lib.optionals usePipewire [
     pipewire
   ] ++ lib.optionals usePulseaudio [

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -9141,8 +9141,8 @@ with pkgs;
 
   jadx = callPackage ../tools/security/jadx { };
 
-  jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { };
-  jamesdsp-pulse = libsForQt5.callPackage ../applications/audio/jamesdsp {
+  jamesdsp = qt6Packages.callPackage ../applications/audio/jamesdsp { };
+  jamesdsp-pulse = qt6Packages.callPackage ../applications/audio/jamesdsp {
     usePipewire = false;
     usePulseaudio = true;
   };