qt58.qtbase: remove SSL decryption patch
This option does not require a patch; it can be enabled through NIX_CFLAGS_COMPILE.
This commit is contained in:
parent
a579e0129c
commit
3062080572
@ -1,13 +0,0 @@
|
|||||||
Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
|
|
||||||
===================================================================
|
|
||||||
--- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp
|
|
||||||
+++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
|
|
||||||
@@ -48,7 +48,7 @@
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
//#define QSSLSOCKET_DEBUG
|
|
||||||
-//#define QT_DECRYPT_SSL_TRAFFIC
|
|
||||||
+#define QT_DECRYPT_SSL_TRAFFIC
|
|
||||||
|
|
||||||
#include "qssl_p.h"
|
|
||||||
#include "qsslsocket_openssl_p.h"
|
|
@ -38,8 +38,7 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
patches =
|
patches =
|
||||||
copyPathsToStore (lib.readPathsFromFile ./. ./series)
|
copyPathsToStore (lib.readPathsFromFile ./. ./series)
|
||||||
++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)]
|
++ [(if stdenv.isDarwin then ./cmake-paths-darwin.patch else ./cmake-paths.patch)];
|
||||||
++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch;
|
|
||||||
|
|
||||||
postPatch =
|
postPatch =
|
||||||
''
|
''
|
||||||
@ -249,7 +248,9 @@ stdenv.mkDerivation {
|
|||||||
# Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
|
# Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
|
||||||
# 10.9 which necessitates the above macro definition that mentions
|
# 10.9 which necessitates the above macro definition that mentions
|
||||||
# 10.10
|
# 10.10
|
||||||
];
|
]
|
||||||
|
|
||||||
|
++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC";
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
find "$out" -name "*.cmake" | while read file; do
|
find "$out" -name "*.cmake" | while read file; do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user