From 680538dbf3849f1a51c545a32f1bc90798f7fc6b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 Aug 2017 19:23:25 +0200 Subject: [PATCH 1/2] pidgin: remove unnecessary dependency Farsight was renamed to Farstream long ago and it is already listed as a dependency. --- .../networking/instant-messengers/pidgin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 45aafba57f30..cf1893b198e5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell , gst_all_1, startupnotification, gettext -, perl, perlXMLParser, libxml2, nss, nspr, farstream, farsight2 +, perl, perlXMLParser, libxml2, nss, nspr, farstream , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn , lib, python, libICE, libXext, libSM , openssl ? null @@ -30,7 +30,7 @@ let unwrapped = stdenv.mkDerivation rec { buildInputs = [ gtkspell2 aspell startupnotification gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - libxml2 nss nspr farstream farsight2 + libxml2 nss nspr farstream libXScrnSaver ncurses python avahi dbus dbus_glib intltool libidn libICE libXext libSM From 114f3c75eca8cae5850bb609bd98e99ce581e6ac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 29 Aug 2017 19:25:24 +0200 Subject: [PATCH 2/2] farsight2: remove Farsight was renamed to Farstream long ago. The old version is unnecessary and so outdated it was removed even from Debian. --- .../libraries/farsight2/default.nix | 25 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/libraries/farsight2/default.nix diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix deleted file mode 100644 index 9ff57257e03b..000000000000 --- a/pkgs/development/libraries/farsight2/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst-plugins-base -, gst-python, gupnp_igd }: - -let - inherit (python2Packages) python pygobject2; -in stdenv.mkDerivation rec { - name = "farsight2-0.0.31"; - - src = fetchurl { - url = "http://farsight.freedesktop.org/releases/farsight2/${name}.tar.gz"; - sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm"; - }; - - buildInputs = [ libnice python pygobject2 gst-python gupnp_igd ]; - - nativeBuildInputs = [ pkgconfig ]; - - propagatedBuildInputs = [ gstreamer gst-plugins-base ]; - - meta = { - homepage = http://farsight.freedesktop.org/wiki/; - description = "Audio/Video Communications Framework"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b180ad5dd640..e68251fae7e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7817,8 +7817,6 @@ with pkgs; farbfeld = callPackage ../development/libraries/farbfeld { }; - farsight2 = callPackage ../development/libraries/farsight2 { }; - farstream = callPackage ../development/libraries/farstream { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad