diff options
author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2017-08-24 14:35:26 +0200 |
---|---|---|
committer | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2017-08-24 15:17:58 +0200 |
commit | be8e1b99176b384e7576369060be88432bb18ede (patch) | |
tree | 5e1e546d61faedf6c4c2a508426dbfb45544f488 /pkgs/applications/misc/copyq/default.nix | |
parent | 6d795e1baefac2cca9e5e97f2f222cc737ccc283 (diff) | |
download | nixpkgs-be8e1b99176b384e7576369060be88432bb18ede.tar nixpkgs-be8e1b99176b384e7576369060be88432bb18ede.tar.gz nixpkgs-be8e1b99176b384e7576369060be88432bb18ede.tar.bz2 nixpkgs-be8e1b99176b384e7576369060be88432bb18ede.tar.lz nixpkgs-be8e1b99176b384e7576369060be88432bb18ede.tar.xz nixpkgs-be8e1b99176b384e7576369060be88432bb18ede.tar.zst nixpkgs-be8e1b99176b384e7576369060be88432bb18ede.zip |
copyq: 2.9.0 -> 3.0.3
- Updated to use qt5 - Added a required cmake patch (like this one for kdenlive https://github.com/NixOS/nixpkgs/issues/26160) - Optional, by default true, dependency on qtwebkit
Diffstat (limited to 'pkgs/applications/misc/copyq/default.nix')
-rw-r--r-- | pkgs/applications/misc/copyq/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 7461f6853f4..4fd30c547b5 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}: +{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git +, webkitSupport ? true +}: stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "2.9.0"; + version = "3.0.3"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f"; + sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl"; }; + patches = [ + ./cmake-modules.patch + ]; + nativeBuildInputs = [ cmake ]; - - buildInputs = [ qt4 libXfixes libXtst ]; + + buildInputs = [ + git qt5.full libXfixes libXtst + ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit; meta = with stdenv.lib; { homepage = https://hluk.github.io/CopyQ; |