CopyQ: 3.13.0 -> 4.1.0

This commit is contained in:
Artturin 2021-07-20 00:38:11 +03:00
parent 20117e607d
commit 53b07b7f33
2 changed files with 50 additions and 14 deletions

View file

@ -1,32 +1,68 @@
{ lib, mkDerivation, fetchFromGitHub, cmake
, qtbase, qtscript, qtwebkit, libXfixes, libXtst, qtx11extras, git
, webkitSupport ? true
{ lib
, mkDerivation
, fetchFromGitHub
, cmake
, extra-cmake-modules
, qtbase
, qtscript
, libXfixes
, libXtst
, qtx11extras
, git
, knotifications
, qtwayland
, wayland
, fetchpatch
}:
mkDerivation rec {
pname = "CopyQ";
version = "3.13.0";
version = "4.1.0";
src = fetchFromGitHub {
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
sha256 = "0qssyavx0dkgsyj2myqg8n7sih8niy960nyb1yknsbjm37iqraah";
sha256 = "1iacnd9dn0mrajff80r2g5nlks5sch9lmpl633mnyqmih9dwx2li";
};
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
git qtbase qtscript libXfixes libXtst qtx11extras
] ++ lib.optional webkitSupport qtwebkit;
qtbase
qtscript
libXfixes
libXtst
qtx11extras
knotifications
qtwayland
wayland
];
patches = [
# Install the bash completion script correctly
# Remove once 4.1.1 is released
(fetchpatch {
url = "https://github.com/hluk/CopyQ/commit/aca7222ec28589af0b08f63686104b992d63ee42.patch";
sha256 = "0d440d0zsdzm9cd0b6c42y9qbrvxg7gdam0qmif62mr8qa0ylidl";
})
];
postPatch = ''
substituteInPlace shared/com.github.hluk.copyq.desktop.in \
--replace copyq "$out/bin/copyq"
'';
meta = with lib; {
homepage = "https://hluk.github.io/CopyQ";
homepage = "https://hluk.github.io/CopyQ";
description = "Clipboard Manager with Advanced Features";
license = licenses.gpl3;
maintainers = [ maintainers.willtim ];
license = licenses.gpl3Only;
maintainers = with maintainers; [ willtim artturin ];
# NOTE: CopyQ supports windows and osx, but I cannot test these.
# OSX build requires QT5.
platforms = platforms.linux;
platforms = platforms.linux;
};
}

View file

@ -23431,7 +23431,7 @@ in
confclerk = callPackage ../applications/misc/confclerk { };
copyq = libsForQt514.callPackage ../applications/misc/copyq { };
copyq = libsForQt5.callPackage ../applications/misc/copyq { };
corectrl = libsForQt5.callPackage ../applications/misc/corectrl { };