From 0604ea66c680828c0d56d7fbfbdb4e25d8dd1e3f Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 2 Sep 2017 21:39:40 +1000 Subject: [PATCH 1/2] ekiga: fix build --- .../networking/instant-messengers/ekiga/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 575759ad437..d4bb8bd55e0 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -1,4 +1,4 @@ -{ stdenv, glib, fetchurl, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool +{ stdenv, glib, fetchurl, fetchpatch, cyrus_sasl, gettext, openldap, ptlib, opal, libXv, rarian, intltool , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi, autoreconfHook , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, gnome3, boost, libsecret , pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib, hicolor_icon_theme @@ -34,7 +34,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./autofoo.patch ./boost.patch ]; + patches = [ + ./autofoo.patch + ./boost.patch + (fetchpatch { url = https://src.fedoraproject.org/rpms/ekiga/raw/dbf5f5ba449d22bd79f0394cddb7d4d8a88ec6ac/f/ekiga-4.0.1-libresolv.patch; + sha256 = "18wc68im8422ibpa0gkrkgjq41m7hikaha3xqmjs2km45i1cwcaz"; + }) + ]; postInstall = '' wrapProgram "$out"/bin/ekiga \ @@ -45,7 +51,6 @@ stdenv.mkDerivation rec { description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; - broken = true; # because of glibc-2.25 }; passthru = { From f9c2cb80a6176df9b9f06938eaab9a356626ded2 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 2 Sep 2017 22:58:23 +1000 Subject: [PATCH 2/2] ekiga: make debian patches use fetchpatch --- .../instant-messengers/ekiga/autofoo.patch | 11 ------- .../instant-messengers/ekiga/boost.patch | 31 ------------------- .../instant-messengers/ekiga/default.nix | 8 +++-- 3 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch delete mode 100644 pkgs/applications/networking/instant-messengers/ekiga/boost.patch diff --git a/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch b/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch deleted file mode 100644 index d15e8b6ccfd..00000000000 --- a/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ - AC_PREREQ([2.53]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_SRCDIR(src/ekiga.cpp) --AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar]) -+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar subdir-objects]) - - AM_MAINTAINER_MODE([enable]) - AC_CONFIG_HEADERS([config.h]) diff --git a/pkgs/applications/networking/instant-messengers/ekiga/boost.patch b/pkgs/applications/networking/instant-messengers/ekiga/boost.patch deleted file mode 100644 index 9dad3d94f04..00000000000 --- a/pkgs/applications/networking/instant-messengers/ekiga/boost.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/m4/ax_boost_base.m4 -+++ b/m4/ax_boost_base.m4 -@@ -33,7 +33,7 @@ - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 20 -+#serial 22 - - AC_DEFUN([AX_BOOST_BASE], - [ -@@ -91,9 +91,17 @@ if test "x$want_boost" = "xyes"; then - dnl are found, e.g. when only header-only libraries are installed! - libsubdirs="lib" - ax_arch=`uname -m` -- if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then -+ case $ax_arch in -+ x86_64|ppc64|s390x|sparc64|aarch64) - libsubdirs="lib64 lib lib64" -- fi -+ ;; -+ esac -+ -+ dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give -+ dnl them priority over the other paths since, if libs are found there, they -+ dnl are almost assuredly the ones desired. -+ AC_REQUIRE([AC_CANONICAL_HOST]) -+ libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs" - - dnl first we check the system location for boost libraries - dnl this location ist chosen if boost libraries are installed with the --layout=system option diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index d4bb8bd55e0..283d38ef5c7 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -35,8 +35,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ - ./autofoo.patch - ./boost.patch + (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/autofoo.patch; + sha256 = "1vyagslws4mm9yfz1m5p1kv9sxmk5lls9vxpm6j72q2ahsgydzx4"; + }) + (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/boost.patch; + sha256 = "01k0rw8ibrrf9zn9lx6dzbrgy58w089hqxqxqdv9whb65cldlj5s"; + }) (fetchpatch { url = https://src.fedoraproject.org/rpms/ekiga/raw/dbf5f5ba449d22bd79f0394cddb7d4d8a88ec6ac/f/ekiga-4.0.1-libresolv.patch; sha256 = "18wc68im8422ibpa0gkrkgjq41m7hikaha3xqmjs2km45i1cwcaz"; })