qtkeychain: Fixes Qt4 build. (#46085)
This commit is contained in:
parent
91cc864c3c
commit
c59d9d371e
2 changed files with 27 additions and 0 deletions
|
@ -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
|
||||||
|
|
|
@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
|
sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = if withQt5 then null else [ ./0001-Fixes-build-with-Qt4.patch ];
|
||||||
|
|
||||||
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
|
cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ]
|
||||||
++ stdenv.lib.optional stdenv.isDarwin [
|
++ stdenv.lib.optional stdenv.isDarwin [
|
||||||
# correctly detect the compiler
|
# correctly detect the compiler
|
||||||
|
|
Loading…
Reference in a new issue