From 2254567b311180451dc690f2e0ddcfe9f6d2d44e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 17 Nov 2010 16:27:48 +0000 Subject: [PATCH] Update farsight2 and enable python bindings svn path=/nixpkgs/branches/stdenv-updates/; revision=24744 --- .../libraries/farsight2/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index b77540ce795e..f504849e2d5f 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/pkgs/development/libraries/farsight2/default.nix @@ -1,16 +1,22 @@ -{stdenv, fetchurl, libnice, pkgconfig, python, glib, gstreamer, gstPluginsBase}: +{stdenv, fetchurl, libnice, pkgconfig, python, glib, gstreamer, gstPluginsBase, + pygobject, gst_python}: -stdenv.mkDerivation { - name = "farsight2-0.0.16"; +stdenv.mkDerivation rec { + name = "farsight2-0.0.22"; src = fetchurl { - url = http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.16.tar.gz; + url = "http://farsight.freedesktop.org/releases/farsight2/${name}.tar.gz"; sha256 = "07yjndkx1p7ij1ifxsnbqbr8943wmq768x4812khka7dx6ii1sv9"; }; - buildInputs = [ libnice pkgconfig python glib gstreamer gstPluginsBase ]; + buildInputs = [ libnice pkgconfig python glib gstreamer gstPluginsBase + pygobject gst_python ]; - configureFlags = "--disable-python"; + preBuild = '' + sed -e '/^[[] -z/d' -i python/Makefile + find . -name Makefile -execdir sed -e '/^[.]NOEXPORT:/d' -i '{}' ';' + find . -name Makefile -execdir sed -r -e 's/^ {8,8}/\t/' -i '{}' ';' + ''; patches = [./makefile.patch];