From 4324ff2f735433104315d6b932b3651ca3fd5879 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 14 Feb 2017 09:02:51 +0100 Subject: [PATCH] sflphone: remove --- .../instant-messengers/sflphone/default.nix | 86 ------------------- .../sflphone/libzrtpcpp-cflags.patch | 15 ---- pkgs/top-level/all-packages.nix | 4 - 3 files changed, 105 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/sflphone/default.nix delete mode 100644 pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix deleted file mode 100644 index 10f63369a9b0..000000000000 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, libpulseaudio, libsamplerate -, commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus -, autoconf, automake, libtool, gettext, perl -, cmake, qt4 -, gtk, glib, dbus_glib, libnotify, intltool, makeWrapper }: - -let - name = "sflphone-1.2.3"; - - src = fetchurl { - url = "https://projects.savoirfairelinux.com/attachments/download/6423/${name}.tar.gz"; - sha256 = "0aiwlky7mp5l51a7kkhkmaz7ivapypar291kdxzdxl1s3qy0x6fd"; - }; - - meta = { - homepage = http://sflphone.org/; - license = stdenv.lib.licenses.gpl3Plus; - description = "Free software enterprise-class softphone for GNU/Linux"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [viric]; - }; - -in -rec { - daemon = stdenv.mkDerivation { - name = name + "-daemon"; - - inherit src; - - patches = [ ./libzrtpcpp-cflags.patch ]; - - preConfigure = '' - cd daemon - - # Post patch, required - autoreconf -vfi - - cd libs - bash ./compile_pjsip.sh - cd .. - ''; - - configureFlags = "--with-expat --with-expat-inc=${expat.dev}/include " + - "--with-expat-lib=-lexpat --with-opus "; - - buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate - commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus - autoconf automake libtool gettext perl ]; - }; - - # This fails still. - # I don't know the best way to make this a KDE program (with switchable kde - # libs, like digikam for example) - /* - kde = stdenv.mkDerivation { - name = name + "-kde"; - - inherit src; - - preConfigure = '' - cd kde - ''; - - buildInputs = [ daemon cmake qt4 pkgconfig ]; - }; - */ - - gnome = stdenv.mkDerivation { - name = name + "-gnome"; - - inherit src; - - preConfigure = '' - cd gnome - ''; - - # gtk3 programs have the runtime dependency on XDG_DATA_DIRS - preFixup = '' - for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do - wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk.out}/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool makeWrapper ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch b/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch deleted file mode 100644 index 972d9c588082..000000000000 --- a/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/daemon/src/audio/audiortp/Makefile.am b/daemon/src/audio/audiortp/Makefile.am -index c27eedd..fe64077 100644 ---- a/daemon/src/audio/audiortp/Makefile.am -+++ b/daemon/src/audio/audiortp/Makefile.am -@@ -4,6 +4,10 @@ noinst_LTLIBRARIES = libaudiortp.la - - if BUILD_ZRTP - SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h -+libaudiortp_la_CXXFLAGS = \ -+ @CCGNU2_CFLAGS@ \ -+ @ZRTPCPP_CFLAGS@ \ -+ @CCRTP_CFLAGS@ - endif - - libaudiortp_la_SOURCES = \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f312219225b0..135f8c18d103 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14939,10 +14939,6 @@ with pkgs; setbfree = callPackage ../applications/audio/setbfree { }; - sflphone = callPackage ../applications/networking/instant-messengers/sflphone { - gtk = gtk3; - }; - shfmt = callPackage ../tools/text/shfmt { }; shutter = callPackage ../applications/graphics/shutter { };