public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28696 from jtojnar/rm-farsight

Browse Source 
farsight2: remove
This commit is contained in:
Franz Pletz 2017-08-30 01:56:26 +02:00 committed by GitHub
commit da988970b2
3 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell { stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell
, gst_all_1, startupnotification, gettext , 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 , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
, lib, python, libICE, libXext, libSM , lib, python, libICE, libXext, libSM
, openssl ? null , openssl ? null
@ -30,7 +30,7 @@ let unwrapped = stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtkspell2 aspell startupnotification gtkspell2 aspell startupnotification
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good 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 libXScrnSaver ncurses python
avahi dbus dbus_glib intltool libidn avahi dbus dbus_glib intltool libidn
libICE libXext libSM libICE libXext libSM

25
pkgs/development/libraries/farsight2/default.nix
View File

@ -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;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -7820,8 +7820,6 @@ with pkgs;
farbfeld = callPackage ../development/libraries/farbfeld { }; farbfeld = callPackage ../development/libraries/farbfeld { };
farsight2 = callPackage ../development/libraries/farsight2 { };
farstream = callPackage ../development/libraries/farstream { farstream = callPackage ../development/libraries/farstream {
inherit (gst_all_1) inherit (gst_all_1)
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad