diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index fb00cdafad44..954d16ce3e73 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,20 +1,21 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake +, ninja , extra-cmake-modules , qtbase -, qtscript +, qtsvg +, qttools +, qtdeclarative , libXfixes , libXtst -, qtx11extras -, knotifications , qtwayland , wayland -, fetchpatch +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "CopyQ"; version = "6.4.0"; @@ -27,16 +28,18 @@ mkDerivation rec { nativeBuildInputs = [ cmake + ninja extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ qtbase - qtscript + qtsvg + qttools + qtdeclarative libXfixes libXtst - qtx11extras - knotifications qtwayland wayland ]; @@ -46,13 +49,14 @@ mkDerivation rec { --replace copyq "$out/bin/copyq" ''; + cmakeFlags = [ "-DWITH_QT6=ON" ]; + meta = with lib; { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3Only; maintainers = with maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. - # OSX build requires QT5. platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fadc2d2c429..1da25f1c4258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28395,7 +28395,7 @@ with pkgs; confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; - copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + copyq = qt6Packages.callPackage ../applications/misc/copyq { }; corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };