From da3d63f5e9a112ded2a9f1e0e2073c05f2d78a3e Mon Sep 17 00:00:00 2001 From: Tungsten842 <886724vf@anonaddy.me> Date: Sat, 27 Jul 2024 13:20:51 +0200 Subject: [PATCH] jamesdsp: build with qt6 --- pkgs/applications/audio/jamesdsp/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/applications/audio/jamesdsp/default.nix index 4f9b5c68c859..11fb94dc0815 100644 --- 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 index 9dbd51473876..9c0478a73212 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9143,8 +9143,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; };