diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-03 18:19:54 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-03 18:21:15 +0300 |
| commit | 2c7e3f276db83a8667723a72510f855dfe4ac87e (patch) | |
| tree | a3399117c12221b00b80d91dfd1eafeb12ba975c | |
| parent | c7d7ad1d9f5cf57970ca15757363c21a6218ca6d (diff) | |
| download | nixlib-2c7e3f276db83a8667723a72510f855dfe4ac87e.tar nixlib-2c7e3f276db83a8667723a72510f855dfe4ac87e.tar.gz nixlib-2c7e3f276db83a8667723a72510f855dfe4ac87e.tar.bz2 nixlib-2c7e3f276db83a8667723a72510f855dfe4ac87e.tar.lz nixlib-2c7e3f276db83a8667723a72510f855dfe4ac87e.tar.xz nixlib-2c7e3f276db83a8667723a72510f855dfe4ac87e.tar.zst nixlib-2c7e3f276db83a8667723a72510f855dfe4ac87e.zip | |
keepassx-community: don't use qt.full
| -rw-r--r-- | pkgs/applications/misc/keepassx/community.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 075de4dcb652..58b45786c40e 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }: +{ stdenv, fetchFromGitHub, cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools }: stdenv.mkDerivation rec { name = "keepassx-community-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p"; }; - buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ]; + buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd ]; meta = { description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b53569a11954..f71d8a00b9b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13142,7 +13142,7 @@ with pkgs; keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; - keepassx-community = callPackage ../applications/misc/keepassx/community.nix { }; + keepassx-community = qt5.callPackage ../applications/misc/keepassx/community.nix { }; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; |