diff options
| author | Joerg Thalheim <joerg@thalheim.io> | 2017-11-10 23:00:17 +0000 |
|---|---|---|
| committer | Joerg Thalheim <joerg@thalheim.io> | 2017-11-10 23:02:23 +0000 |
| commit | eb966a3b8710464cfe175c319beb2b8aba87bf02 (patch) | |
| tree | 75cb1bbf9469564c8c3a47616e86718796c82d9b /pkgs/applications | |
| parent | 98fcc3bd5d5006d7f647ad0a449d1b1e7f7a8641 (diff) | |
| download | nixpkgs-eb966a3b8710464cfe175c319beb2b8aba87bf02.tar nixpkgs-eb966a3b8710464cfe175c319beb2b8aba87bf02.tar.gz nixpkgs-eb966a3b8710464cfe175c319beb2b8aba87bf02.tar.bz2 nixpkgs-eb966a3b8710464cfe175c319beb2b8aba87bf02.tar.lz nixpkgs-eb966a3b8710464cfe175c319beb2b8aba87bf02.tar.xz nixpkgs-eb966a3b8710464cfe175c319beb2b8aba87bf02.tar.zst nixpkgs-eb966a3b8710464cfe175c319beb2b8aba87bf02.zip | |
copyq: 3.0.3 -> 3.1.2
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/copyq/cmake-modules.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/misc/copyq/default.nix | 16 |
2 files changed, 8 insertions, 20 deletions
diff --git a/pkgs/applications/misc/copyq/cmake-modules.patch b/pkgs/applications/misc/copyq/cmake-modules.patch deleted file mode 100644 index f21105763de..00000000000 --- a/pkgs/applications/misc/copyq/cmake-modules.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d910299e..69888477 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -99,6 +99,7 @@ endif() - - # Qt modules - if (WITH_QT5) -+ find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script) - qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules}) - else() - set(QT_USE_QTNETWORK TRUE) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 4fd30c547b5..754e20268c5 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git +{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git , webkitSupport ? true }: stdenv.mkDerivation rec { name = "CopyQ-${version}"; - version = "3.0.3"; + version = "3.1.2"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl"; + sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl"; }; - patches = [ - ./cmake-modules.patch - ]; + #patches = [ + # ./cmake-modules.patch + #]; nativeBuildInputs = [ cmake ]; buildInputs = [ - git qt5.full libXfixes libXtst - ] ++ stdenv.lib.optional webkitSupport qt5.qtwebkit; + git qtbase qtscript libXfixes libXtst + ] ++ stdenv.lib.optional webkitSupport qtwebkit; meta = with stdenv.lib; { homepage = https://hluk.github.io/CopyQ; |