From 40d68166485553dae69e0c3c3ba91d18837ab9ee Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 31 Oct 2023 23:27:27 +0100 Subject: [PATCH] qpwgraph: switch to Qt 6 Signed-off-by: Sefa Eyeoglu --- pkgs/applications/audio/qpwgraph/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 01d35ba2597f..06015b3fd545 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -1,9 +1,9 @@ -{ lib, mkDerivation, fetchFromGitLab -, cmake, pkg-config -, alsa-lib, pipewire +{ lib, stdenv, fetchFromGitLab +, cmake, pkg-config, wrapQtAppsHook +, qtbase, qtsvg, qtwayland, alsa-lib, pipewire }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "qpwgraph"; version = "0.5.3"; @@ -15,9 +15,9 @@ mkDerivation rec { sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ alsa-lib pipewire ]; + buildInputs = [ qtbase qtsvg qtwayland alsa-lib pipewire ]; meta = with lib; { description = "Qt graph manager for PipeWire, similar to QjackCtl."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8583b8ca62c4..75756edda749 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34926,7 +34926,7 @@ with pkgs; qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; - qpwgraph = libsForQt5.callPackage ../applications/audio/qpwgraph { }; + qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { }; qrcode = callPackage ../tools/graphics/qrcode { };