forked from mirrors/nixpkgs
weechat: Bump to 1.0.
A happy day for all weechat-users!
This commit is contained in:
parent
4329812ec7
commit
94c08cf163
|
@ -3,12 +3,12 @@
|
|||
, pythonPackages, cacert, cmake, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.4.3";
|
||||
version = "1.0";
|
||||
name = "weechat-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://weechat.org/files/src/${name}.tar.gz";
|
||||
sha256 = "1sfx2j8xy6das0zis2nmzi9z41q96gzq61xaw4i0xbgag17s7ddz";
|
||||
sha256 = "1z17wyrl5fp697qp44srpmzk79w37f5hm1r0krffbmga6sbzdj3x";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
@ -17,13 +17,6 @@ stdenv.mkDerivation rec {
|
|||
cacert cmake ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync;
|
||||
|
||||
# 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 ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
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})
|
||||
|
Loading…
Reference in a new issue