diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2019-06-01 15:55:03 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2019-06-01 17:31:50 +0300 |
| commit | a13920dea00942f40bde5448ec99c6dabe78b3c6 (patch) | |
| tree | 19b0c49eb8d39c8c2950431b8137a955e6e46c2c /pkgs/applications/misc/keepassx | |
| parent | 929aac2239d290b2a71825380743a3c8b3243088 (diff) | |
| download | nixpkgs-a13920dea00942f40bde5448ec99c6dabe78b3c6.tar nixpkgs-a13920dea00942f40bde5448ec99c6dabe78b3c6.tar.gz nixpkgs-a13920dea00942f40bde5448ec99c6dabe78b3c6.tar.bz2 nixpkgs-a13920dea00942f40bde5448ec99c6dabe78b3c6.tar.lz nixpkgs-a13920dea00942f40bde5448ec99c6dabe78b3c6.tar.xz nixpkgs-a13920dea00942f40bde5448ec99c6dabe78b3c6.tar.zst nixpkgs-a13920dea00942f40bde5448ec99c6dabe78b3c6.zip | |
keepassxc: drop quazip patch
Not needed after quazip update.
Diffstat (limited to 'pkgs/applications/misc/keepassx')
| -rw-r--r-- | pkgs/applications/misc/keepassx/community.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/misc/keepassx/quazip5.patch | 27 |
2 files changed, 0 insertions, 28 deletions
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index ee99e21f6ec..b52cff784e5 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch - ./quazip5.patch ]; cmakeFlags = [ diff --git a/pkgs/applications/misc/keepassx/quazip5.patch b/pkgs/applications/misc/keepassx/quazip5.patch deleted file mode 100644 index ccea841cac7..00000000000 --- a/pkgs/applications/misc/keepassx/quazip5.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/cmake/FindQuaZip.cmake b/cmake/FindQuaZip.cmake -index 8d309181..92aa892c 100644 ---- a/cmake/FindQuaZip.cmake -+++ b/cmake/FindQuaZip.cmake -@@ -9,7 +9,6 @@ IF(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) - SET(QUAZIP_FOUND TRUE) - ELSE(QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) - IF(Qt5Core_FOUND) -- set(QUAZIP_LIB_VERSION_SUFFIX 5) - ENDIF() - IF(WIN32) - FIND_PATH(QUAZIP_LIBRARY_DIR -diff --git a/src/keeshare/ShareObserver.cpp b/src/keeshare/ShareObserver.cpp -index 33f5ed1f..5fcd9202 100644 ---- a/src/keeshare/ShareObserver.cpp -+++ b/src/keeshare/ShareObserver.cpp -@@ -46,8 +46,8 @@ - #include <QStringBuilder> - - #if defined(WITH_XC_KEESHARE_SECURE) --#include <quazip5/quazip.h> --#include <quazip5/quazipfile.h> -+#include <quazip/quazip.h> -+#include <quazip/quazipfile.h> - #endif - - namespace |