diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-03-21 13:46:56 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-03-21 13:46:56 +0100 |
| commit | 1941168c3d4c03441a92093dfb7be4ae507711ae (patch) | |
| tree | 8112d4a885e908da1a15bd85eca9bf5164ef9c23 /pkgs/applications/networking | |
| parent | 65155c20d585eb1d3b2084cac23303d9ad61b0b9 (diff) | |
| parent | f3f6f04c7d64030fdaaf97cdd381c23b3faeae0b (diff) | |
| download | nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.gz nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.bz2 nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.lz nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.xz nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.tar.zst nixlib-1941168c3d4c03441a92093dfb7be4ae507711ae.zip | |
Merge branch master into x-updates (fix eval)
Diffstat (limited to 'pkgs/applications/networking')
| -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}) + |