diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-03-21 13:26:03 +0100 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-03-21 13:26:23 +0100 |
| commit | 8edc5f9999026fe206b34815004488f9b6eb75e0 (patch) | |
| tree | fcf32dd6ea13f178c86735cf94b46035b7f8c2e1 /pkgs/applications/networking/irc | |
| parent | 5f27ed59f092a48d637a597285c2da9a72d00d30 (diff) | |
| download | nixlib-8edc5f9999026fe206b34815004488f9b6eb75e0.tar nixlib-8edc5f9999026fe206b34815004488f9b6eb75e0.tar.gz nixlib-8edc5f9999026fe206b34815004488f9b6eb75e0.tar.bz2 nixlib-8edc5f9999026fe206b34815004488f9b6eb75e0.tar.lz nixlib-8edc5f9999026fe206b34815004488f9b6eb75e0.tar.xz nixlib-8edc5f9999026fe206b34815004488f9b6eb75e0.tar.zst nixlib-8edc5f9999026fe206b34815004488f9b6eb75e0.zip | |
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.
Diffstat (limited to 'pkgs/applications/networking/irc')
| -rw-r--r-- | pkgs/applications/networking/irc/weechat/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff | 16 |
2 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 89b437acc905..b47018e0d970 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { 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 = '' wrapProgram "$out/bin/weechat" \ --prefix PYTHONPATH : "$PYTHONPATH" \ diff --git a/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff b/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff new file mode 100644 index 000000000000..56e357c8f7dc --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/fix-gnutls-32.diff @@ -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}) + |