BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #212082 from QuantMint/copyq-qt6

Browse source
This commit is contained in:
Artturi 2023-01-22 13:44:18 +02:00 committed by GitHub
commit 8308b25bb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/applications/misc/copyq/default.nix
View file

@ -1,20 +1,21 @@
{ lib { lib
, mkDerivation , stdenv
, fetchFromGitHub , fetchFromGitHub
, cmake , cmake
, ninja
, extra-cmake-modules , extra-cmake-modules
, qtbase , qtbase
, qtscript , qtsvg
, qttools
, qtdeclarative
, libXfixes , libXfixes
, libXtst , libXtst
, qtx11extras
, knotifications
, qtwayland , qtwayland
, wayland , wayland
, fetchpatch , wrapQtAppsHook
}: }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "CopyQ"; pname = "CopyQ";
version = "6.4.0"; version = "6.4.0";
@ -27,16 +28,18 @@ mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
ninja
extra-cmake-modules extra-cmake-modules
wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
qtbase qtbase
qtscript qtsvg
qttools
qtdeclarative
libXfixes libXfixes
libXtst libXtst
qtx11extras
knotifications
qtwayland qtwayland
wayland wayland
]; ];
@ -46,13 +49,14 @@ mkDerivation rec {
--replace copyq "$out/bin/copyq" --replace copyq "$out/bin/copyq"
''; '';
cmakeFlags = [ "-DWITH_QT6=ON" ];
meta = with lib; { meta = with lib; {
homepage = "https://hluk.github.io/CopyQ"; homepage = "https://hluk.github.io/CopyQ";
description = "Clipboard Manager with Advanced Features"; description = "Clipboard Manager with Advanced Features";
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ artturin ]; maintainers = with maintainers; [ artturin ];
# NOTE: CopyQ supports windows and osx, but I cannot test these. # NOTE: CopyQ supports windows and osx, but I cannot test these.
# OSX build requires QT5.
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

2
pkgs/top-level/all-packages.nix
View file

@ -28395,7 +28395,7 @@ with pkgs;
confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; confclerk = libsForQt5.callPackage ../applications/misc/confclerk { };
copyq = libsForQt5.callPackage ../applications/misc/copyq { }; copyq = qt6Packages.callPackage ../applications/misc/copyq { };
corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };