diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2018-09-05 03:28:50 -0400 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-05 09:28:50 +0200 |
| commit | c59d9d371ecca2b7cc5798aecb75252a9c396f8a (patch) | |
| tree | 2483331bd279b734f018d9d529cbe9d3160f1024 /pkgs/development/libraries/qtkeychain | |
| parent | 91cc864c3caaf04a931b46596a22d4cddddf04d1 (diff) | |
qtkeychain: Fixes Qt4 build. (#46085)
Diffstat (limited to 'pkgs/development/libraries/qtkeychain')
| -rw-r--r-- | pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch | 25 | ||||
| -rw-r--r-- | pkgs/development/libraries/qtkeychain/default.nix | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch new file mode 100644 index 000000000000..4cd7214e61e2 --- /dev/null +++ b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch @@ -0,0 +1,25 @@ +From f72e5b67ee1137a0ccd57db5d077a197b01b3cdc Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel <samuel@dionne-riel.com> +Date: Tue, 4 Sep 2018 23:19:29 -0400 +Subject: [PATCH] Fixes build with Qt4. + +--- + keychain_unix.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/keychain_unix.cpp b/keychain_unix.cpp +index 30b26c3..b27ebef 100644 +--- a/keychain_unix.cpp ++++ b/keychain_unix.cpp +@@ -91,7 +91,7 @@ static bool isKwallet5Available() + // a wallet can be opened. + + iface.setTimeout(500); +- QDBusMessage reply = iface.call(QStringLiteral("networkWallet")); ++ QDBusMessage reply = iface.call("networkWallet"); + return reply.type() == QDBusMessage::ReplyMessage; + } + +-- +2.16.4 + diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 220c6241096d..2b3c88d58860 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1 }; + patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ]; + cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ] ++ stdenv.lib.optional stdenv.isDarwin [ # correctly detect the compiler |