Merge pull request #264683 from Scrumplex/pkgs/qpwgraph/qt6

authored by

Franz Pletz and committed by
GitHub
79d0b86c 03e14045

+18 -9
+17 -8
pkgs/applications/audio/qpwgraph/default.nix
··· 1 - { lib, mkDerivation, fetchFromGitLab 2 - , cmake, pkg-config 3 - , alsa-lib, pipewire 1 + { lib 2 + , stdenv 3 + , fetchFromGitLab 4 + , cmake 5 + , pkg-config 6 + , wrapQtAppsHook 7 + , qtbase 8 + , qtsvg 9 + , qtwayland 10 + , alsa-lib 11 + , pipewire 4 12 }: 5 13 6 - mkDerivation rec { 14 + stdenv.mkDerivation (finalAttrs: { 7 15 pname = "qpwgraph"; 8 16 version = "0.5.3"; 9 17 ··· 11 19 domain = "gitlab.freedesktop.org"; 12 20 owner = "rncbc"; 13 21 repo = "qpwgraph"; 14 - rev = "v${version}"; 22 + rev = "v${finalAttrs.version}"; 15 23 sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U="; 16 24 }; 17 25 18 - nativeBuildInputs = [ cmake pkg-config ]; 26 + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; 19 27 20 - buildInputs = [ alsa-lib pipewire ]; 28 + buildInputs = [ qtbase qtsvg qtwayland alsa-lib pipewire ]; 21 29 22 30 cmakeFlags = [ "-DCONFIG_WAYLAND=ON" ]; 23 31 ··· 32 40 license = licenses.gpl2Plus; 33 41 platforms = platforms.linux; 34 42 maintainers = with maintainers; [ kanashimia exi Scrumplex ]; 43 + mainProgram = "qpwgraph"; 35 44 }; 36 - } 45 + })
+1 -1
pkgs/top-level/all-packages.nix
··· 34923 34923 34924 34924 qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; 34925 34925 34926 - qpwgraph = libsForQt5.callPackage ../applications/audio/qpwgraph { }; 34926 + qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { }; 34927 34927 34928 34928 qrcode = callPackage ../tools/graphics/qrcode { }; 34929 34929