Skip to content

Commit

Permalink
libsForQt5.qtkeychain: add libsecret support
Browse files Browse the repository at this point in the history
qtkeychain uses pkg-config to detect whether libsecret is available,
otherwise it just builds a stub object file.

We need libsecret support to allow nextcloud-client storing passwords
on Freedesktop platforms.

I also fixed the Darwin dependencies not being used with Qt5,
even though the build did not complain.
  • Loading branch information
jtojnar committed Apr 27, 2019
1 parent dfd8f84 commit 48316ae
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions pkgs/development/libraries/qtkeychain/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, qt4 ? null
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt4 ? null
, withQt5 ? false, qtbase ? null, qttools ? null
, darwin ? null
, libsecret
}:

assert withQt5 -> qtbase != null;
Expand All @@ -22,11 +23,14 @@ stdenv.mkDerivation rec {

cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];

nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ cmake ]
++ stdenv.lib.optional (!stdenv.isDarwin) [ pkgconfig ] # for finding libsecret
;

buildInputs = if withQt5 then [ qtbase qttools ] else [ qt4 ]
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ libsecret ]
++ (if withQt5 then [ qtbase qttools ] else [ qt4 ])
++ stdenv.lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation Security
CoreFoundation Security
])
;

Expand Down

0 comments on commit 48316ae

Please sign in to comment.