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

add gstreamer 1.0 setup-hook and use it where appropriate

Browse Source
This commit is contained in:
Domen Kožar 2014-02-28 02:03:07 +01:00
parent 0e58538fa8
commit e9f3199973
8 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/programs/environment.nix
View File

@ -45,7 +45,7 @@ in
TERMINFO_DIRS = [ "${i}/share/terminfo" ]; TERMINFO_DIRS = [ "${i}/share/terminfo" ];
PERL5LIB = [ "${i}/lib/perl5/site_perl" ]; PERL5LIB = [ "${i}/lib/perl5/site_perl" ];
ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ]; ALSA_PLUGIN_DIRS = [ "${i}/lib/alsa-lib" ];
GST_PLUGIN_PATH = [ "${i}/lib/gstreamer-0.10" ]; GST_PLUGIN_SYSTEM_PATH = [ "${i}/lib/gstreamer-0.10" ];
KDEDIRS = [ "${i}" ]; KDEDIRS = [ "${i}" ];
STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ]; STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ];
QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ]; QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ];

5
pkgs/applications/audio/mopidy/default.nix
View File

@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec {
}; };
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
gst_python pygobject pykka pyspotify pylast cherrypy ws4py gst_python pygobject pykka pyspotify pylast cherrypy ws4py gst_plugins_base gst_plugins_good
]; ];
# python zip complains about old timestamps # python zip complains about old timestamps
@ -27,8 +27,7 @@ pythonPackages.buildPythonPackage rec {
postInstall = '' postInstall = ''
for p in $out/bin/mopidy $out/bin/mopidy-scan; do for p in $out/bin/mopidy $out/bin/mopidy-scan; do
wrapProgram $p \ wrapProgram $p \
--prefix GST_PLUGIN_PATH : ${gst_plugins_good}/lib/gstreamer-0.10 \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
--prefix GST_PLUGIN_PATH : ${gst_plugins_base}/lib/gstreamer-0.10
done done
''; '';

9
pkgs/applications/audio/quodlibet/default.nix
View File

@ -52,13 +52,8 @@ buildPythonPackage {
postInstall = stdenv.lib.optionalString withGstPlugins '' postInstall = stdenv.lib.optionalString withGstPlugins ''
# Wrap quodlibet so it finds the GStreamer plug-ins # Wrap quodlibet so it finds the GStreamer plug-ins
wrapProgram "$out/bin/quodlibet" --prefix \ wrapProgram "$out/bin/quodlibet" --prefix \
GST_PLUGIN_PATH ":" \ GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" \
${ stdenv.lib.concatStringsSep ":"
(map (s: s+"/lib/gstreamer-0.10")
(stdenv.lib.filter (s: s != null) [
gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad
])) }
''; '';
meta = { meta = {

4
pkgs/applications/video/gnash/default.nix
View File

@ -97,9 +97,7 @@ stdenv.mkDerivation rec {
# (e.g., gst-ffmpeg is needed to watch movies such as YouTube's). # (e.g., gst-ffmpeg is needed to watch movies such as YouTube's).
for prog in "$out/bin/"* for prog in "$out/bin/"*
do do
wrapProgram "$prog" --prefix \ wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH"
GST_PLUGIN_PATH ":" \
"${gst_plugins_base}/lib/gstreamer-0.10:${gst_plugins_good}/lib/gstreamer-0.10:${gst_ffmpeg}/lib/gstreamer-0.10"
done done
''; '';

11
pkgs/desktops/xfce/applications/parole.nix
View File

@ -18,21 +18,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ buildInputs = [
makeWrapper gst_all_1.gst-plugins-base makeWrapper
gtk dbus_glib libxfce4ui libxfce4util xfconf gtk dbus_glib libxfce4ui libxfce4util xfconf
taglib libnotify taglib libnotify
]; ] ++ with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav];
configureFlags = [ "--with-gstreamer=1.0" ]; configureFlags = [ "--with-gstreamer=1.0" ];
postInstall = stdenv.lib.optionalString withGstPlugins '' postInstall = stdenv.lib.optionalString withGstPlugins ''
wrapProgram "$out/bin/parole" --prefix \ wrapProgram "$out/bin/parole" --prefix \
GST_PLUGIN_PATH ":" ${stdenv.lib.concatStringsSep ":" GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
(map (s: s+"/lib/gstreamer-1.0") (with gst_all_1; [
gst-plugins-base gst-plugins-good
gst-plugins-bad gst-plugins-ugly
gst-libav
])) }
''; '';
meta = { meta = {

2
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -23,4 +23,6 @@ stdenv.mkDerivation rec {
]; ];
propagatedBuildInputs = [ glib ]; propagatedBuildInputs = [ glib ];
setupHook = ./setup-hook.sh;
} }

9
pkgs/development/libraries/gstreamer/core/setup-hook.sh Normal file
View File

@ -0,0 +1,9 @@
addGstreamerLibPath () {
if test -d "$1/lib/gstreamer-1.0"
then
export GST_PLUGIN_SYSTEM_PATH_1_0="${GST_PLUGIN_SYSTEM_PATH_1_0}${GST_PLUGIN_SYSTEM_PATH_1_0:+:}$1/lib/gstreamer-1.0"
fi
}
envHooks=(${envHooks[@]} addGstreamerLibPath)

2
pkgs/development/libraries/gstreamer/legacy/gstreamer/setup-hook.sh
View File

@ -1,7 +1,7 @@
addGstreamerLibPath () { addGstreamerLibPath () {
if test -d "$1/lib/gstreamer-0.10" if test -d "$1/lib/gstreamer-0.10"
then then
export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}${GST_PLUGIN_PATH:+:}$1/lib/gstreamer-0.10" export GST_PLUGIN_SYSTEM_PATH="${GST_PLUGIN_SYSTEM_PATH}${GST_PLUGIN_SYSTEM_PATH:+:}$1/lib/gstreamer-0.10"
fi fi
} }