weechat: Backport fix for freeze with gnutls 3.2.
Fixes /exit when using gnutls 3.2. This is a temporary solution as 3.1 isn't building right now. The next release of weechat will include this fix.
This commit is contained in:
parent
5f27ed59f0
commit
8edc5f9999
@ -17,6 +17,13 @@ stdenv.mkDerivation rec {
|
|||||||
cacert cmake
|
cacert cmake
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# This patch is based on
|
||||||
|
# weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes
|
||||||
|
# freeze/crash on /exit when using nixpkgs' gnutls 3.2. The next
|
||||||
|
# weechat release (0.4.4) will include this, so it's safe to remove
|
||||||
|
# then.
|
||||||
|
patches = [ ./fix-gnutls-32.diff ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
wrapProgram "$out/bin/weechat" \
|
wrapProgram "$out/bin/weechat" \
|
||||||
--prefix PYTHONPATH : "$PYTHONPATH" \
|
--prefix PYTHONPATH : "$PYTHONPATH" \
|
||||||
|
16
pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff
Normal file
16
pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
|
||||||
|
index 325c611..a8927bc 100644
|
||||||
|
--- a/src/gui/curses/CMakeLists.txt
|
||||||
|
+++ b/src/gui/curses/CMakeLists.txt
|
||||||
|
@@ -53,9 +53,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||||
|
ENDIF(HAVE_BACKTRACE)
|
||||||
|
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||||
|
|
||||||
|
-IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
|
||||||
|
- LIST(APPEND EXTRA_LIBS "pthread")
|
||||||
|
-ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
|
||||||
|
+LIST(APPEND EXTRA_LIBS "pthread")
|
||||||
|
|
||||||
|
IF(ICONV_LIBRARY)
|
||||||
|
LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
|
||||||
|
|
@ -9215,10 +9215,7 @@ let
|
|||||||
graphicsSupport = false;
|
graphicsSupport = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
weechat = callPackage ../applications/networking/irc/weechat {
|
weechat = callPackage ../applications/networking/irc/weechat { };
|
||||||
# weechat doesn't exit with gnutls32. Use 3.1 for now.
|
|
||||||
gnutls = gnutls31;
|
|
||||||
};
|
|
||||||
|
|
||||||
weston = callPackage ../applications/window-managers/weston { };
|
weston = callPackage ../applications/window-managers/weston { };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user