Merge pull request #330388 from Tungsten842/jamesdsp-qt6

jamesdsp: build with qt6
2024-07-28 00:25:10 +08:00
parent ba3a78d20a da3d63f5e9
commit f144faebf1
2 changed files with 4 additions and 2 deletions
@@ -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 [
@@ -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;
  };