BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #95066 from devhell/update-profanity

Browse source 
profanity: 0.8.1 -> 0.9.5
This commit is contained in:
adisbladis 2020-08-12 22:55:26 +02:00 committed by GitHub
commit 073fa3ef4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/instant-messengers/profanity/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl
, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
, cmocka, libmicrohttpd, stabber, expat, libmesode
, cmocka, libmicrohttpd, expat, sqlite, libmesode
, autoconf-archive
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
@ -22,16 +22,18 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "profanity";
version = "0.8.1";
version = "0.9.5";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
rev = version;
sha256 = "0fg5xcdlvhsi7a40w4jcxyj7m7wl42jy1cvsa8fi2gb6g9y568k8";
sha256 = "14vbblf639f90bb4npg2xv53cpvk9am9ic4pmc1vnv4m3zsndjg5";
};
patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];
patches = [
./patches/packages-osx.patch
];
enableParallelBuilding = true;
@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
buildInputs = [
expect readline libuuid glib openssl expat ncurses libotr
curl libmesode cmocka libmicrohttpd stabber
curl libmesode cmocka libmicrohttpd sqlite
] ++ optionals autoAwaySupport [ libXScrnSaver libX11 ]
++ optionals notifySupport [ libnotify gdk-pixbuf ]
++ optionals traySupport [ gnome2.gtk ]

40
pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
View file

@ -1,40 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 1e55b1cc..0832a387 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then
AM_CONDITIONAL([BUILD_PYTHON_API], [true])
AC_DEFINE([HAVE_PYTHON], [1], [Python support])
else
- if test "x$enable_python_plugins" = xyes; then
- AC_MSG_ERROR([Python not found, cannot enable Python plugins.])
- else
- AM_CONDITIONAL([BUILD_PYTHON_API], [false])
- AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])
- fi
+ AS_IF(
+ [test "x$enable_python_plugins" = xyes],
+ [],
+ [AM_CONDITIONAL([BUILD_PYTHON_API], [false])
+ AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])]
+ )
fi
AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework])
else
@@ -107,7 +105,7 @@ else
[AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
[AS_IF(
[test "x$enable_c_plugins" = xyes],
- [AC_MSG_ERROR([dl library needed to run C plugins])],
+ [],
[AM_CONDITIONAL([BUILD_C_API], [false])])
])
else
@@ -116,7 +114,6 @@ else
fi
# threading
-ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])])
LIBS="$PTHREAD_LIBS $LIBS"
CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ])