diff options
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/gajim/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/farstream/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index cfd89874f492..1def7e2b1f01 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -8,7 +8,8 @@ let pkgconfig makeWrapper libglade pyopenssl libXScrnSaver libXt xproto libXext xextproto libX11 gtkspell aspell scrnsaverproto pycrypto pythonDBus pythonSexy - docutils pyasn1 + docutils pyasn1 farstream gst_plugins_bad gstreamer + gst_ffmpeg gst_python ]; in rec { @@ -37,6 +38,7 @@ rec { sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name" sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim" sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim" + sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim" done '') ["wrapBinContentsPython"]; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index b2b8ca6255b1..3babcb828337 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base -, pygobject, gst_python, gupnp_igd }: +, pygobject, gst_python, gupnp_igd +, gst_plugins_good, gst_plugins_bad, gst_ffmpeg +}: stdenv.mkDerivation rec { name = "farstream-0.1.2"; @@ -8,11 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps"; }; - buildInputs = [ libnice python pygobject gst_python gupnp_igd ]; + buildInputs = [ libnice python pygobject gupnp_igd ]; buildNativeInputs = [ pkgconfig ]; - propagatedBuildInputs = [ gstreamer gst_plugins_base ]; + propagatedBuildInputs = [ gstreamer gst_plugins_base gst_python + gst_plugins_good gst_plugins_bad gst_ffmpeg + ]; meta = { homepage = http://www.freedesktop.org/wiki/Software/Farstream; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2481ffd5a23..47c2561b5659 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8683,7 +8683,7 @@ let gajim = builderDefsPackage (import ../applications/networking/instant-messengers/gajim) { inherit perl intltool pyGtkGlade gettext pkgconfig makeWrapper pygobject pyopenssl gtkspell libsexy pycrypto aspell pythonDBus pythonSexy - docutils gtk; + docutils gtk farstream gst_plugins_bad gstreamer gst_ffmpeg gst_python; dbus = dbus.libs; inherit (gnome) libglade; inherit (xlibs) libXScrnSaver libXt xproto libXext xextproto libX11 |