The attached patch gets the farstream expression to build; it is currently
failing.
>From f794c8e37813e88d2ae7648564f094f0d93a18e5 Mon Sep 17 00:00:00 2001
From: Karn Kallio <[email protected]>
Date: Sun, 2 Feb 2014 17:24:04 -0430
Subject: [PATCH] farstream: Fix the build.
---
pkgs/development/libraries/farstream/default.nix | 12 ++++++++++--
.../libraries/gstreamer/legacy/gstreamer/default.nix | 9 ++++++---
pkgs/top-level/all-packages.nix | 4 +++-
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 7d84cf8..245e9b6 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base
, pygobject, gst_python, gupnp_igd
-, gst_plugins_good, gst_plugins_bad, gst_ffmpeg
+, gst_plugins_good, gst_plugins_bad, gst_ffmpeg, file
}:
stdenv.mkDerivation rec {
@@ -10,9 +10,17 @@ stdenv.mkDerivation rec {
sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps";
};
+ prePatch = ''
+ sed -i 's@/usr/bin/file@file@g' configure
+ sed -i 's@/\*< protected >\*/@@' farstream/fs-session.h
+ sed -i 's@(transfer full)@@' farstream/*.c
+ sed -i 's@Transfer: full@@' farstream/*.c
+ rm farstream/Farstream*.gir
+ '';
+
buildInputs = [ libnice python pygobject gupnp_igd libnice ];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig file ];
propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python
gst_plugins_good gst_plugins_bad gst_ffmpeg
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
index 392e8e3..eb6fac6 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
@@ -1,4 +1,7 @@
-{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintlOrEmpty }:
+{ fetchurl, stdenv, perl, bison, flex, pkgconfig, glib, libxml2, libintlOrEmpty, gobjectIntrospection
+, introspectionSupport ? false }:
+
+with stdenv.lib ;
stdenv.mkDerivation rec {
name = "gstreamer-0.10.36";
@@ -12,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl bison flex pkgconfig ];
- propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty;
+ propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty ++ lists.optional introspectionSupport gobjectIntrospection ;
patchPhase = ''
sed -i -e 's/^ /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in
@@ -20,7 +23,7 @@ stdenv.mkDerivation rec {
configureFlags = ''
--disable-examples --enable-failing-tests --localstatedir=/var --disable-gtk-doc --disable-docbook
- '';
+ '' + enableFeature introspectionSupport "introspection" ;
# Hm, apparently --disable-gtk-doc is ignored...
postInstall = "rm -rf $out/share/gtk-doc";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76b52f8..2f10af0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4037,7 +4037,9 @@ let
farsight2 = callPackage ../development/libraries/farsight2 { };
- farstream = callPackage ../development/libraries/farstream { };
+ farstream = callPackage ../development/libraries/farstream {
+ gstreamer = gstreamer.override { introspectionSupport = true; };
+ };
fcgi = callPackage ../development/libraries/fcgi { };
--
1.8.5.2
_______________________________________________
nix-dev mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-dev
