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

This commit is contained in:
Franz Pletz 2023-11-01 17:39:17 +01:00 committed by GitHub
commit 79d0b86c4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions

View File

@ -1,9 +1,17 @@
{ 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 (finalAttrs: {
pname = "qpwgraph";
version = "0.5.3";
@ -11,13 +19,13 @@ mkDerivation rec {
domain = "gitlab.freedesktop.org";
owner = "rncbc";
repo = "qpwgraph";
rev = "v${version}";
rev = "v${finalAttrs.version}";
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 ];
cmakeFlags = [ "-DCONFIG_WAYLAND=ON" ];
@ -32,5 +40,6 @@ mkDerivation rec {
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ kanashimia exi Scrumplex ];
mainProgram = "qpwgraph";
};
}
})

View File

@ -34923,7 +34923,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 { };