diff options
author | Thomas Tuegel <ttuegel@secure.mailbox.org> | 2017-03-10 08:02:21 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-10 08:02:21 -0600 |
commit | 290c096a1611c471e16b70b9444e57b3d1231236 (patch) | |
tree | 450ea7af379fe6405fc59fc9e7f98ccc9bdc48bc /pkgs | |
parent | 7dcc40b674e98ef9216262a969888ca9342728de (diff) | |
parent | 64b88c3017089c55bbf7fb272696f62a4369a187 (diff) | |
download | nixlib-290c096a1611c471e16b70b9444e57b3d1231236.tar nixlib-290c096a1611c471e16b70b9444e57b3d1231236.tar.gz nixlib-290c096a1611c471e16b70b9444e57b3d1231236.tar.bz2 nixlib-290c096a1611c471e16b70b9444e57b3d1231236.tar.lz nixlib-290c096a1611c471e16b70b9444e57b3d1231236.tar.xz nixlib-290c096a1611c471e16b70b9444e57b3d1231236.tar.zst nixlib-290c096a1611c471e16b70b9444e57b3d1231236.zip |
Merge pull request #23504 from ttuegel/phonon-gstreamer
phonon-gstreamer-backend: Hardcode GStreamer plugin paths
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/phonon/backends/gstreamer.nix | 27 |
2 files changed, 35 insertions, 5 deletions
diff --git a/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch b/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch new file mode 100644 index 000000000000..39c1b9c0d290 --- /dev/null +++ b/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch @@ -0,0 +1,13 @@ +Index: phonon-gstreamer-4.9.0/gstreamer/backend.cpp +=================================================================== +--- phonon-gstreamer-4.9.0.orig/gstreamer/backend.cpp ++++ phonon-gstreamer-4.9.0/gstreamer/backend.cpp +@@ -85,6 +85,8 @@ Backend::Backend(QObject *parent, const + "--gst-debug-no-color" + }; + ++ qputenv("GST_PLUGIN_PATH_1_0", GST_PLUGIN_PATH_1_0); ++ + int argc = sizeof(args) / sizeof(*args); + char **argv = const_cast<char**>(args); + GError *err = 0; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index d8358757094d..e0f24fbc822a 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -29,15 +29,32 @@ stdenv.mkDerivation rec { sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf"; }; + # Hardcode paths to useful plugins so the backend doesn't depend + # on system paths being set. + patches = [ ./gst-plugin-paths.patch ]; + + NIX_CFLAGS_COMPILE = + let gstPluginPaths = + lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0" + (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]); + in [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" + + ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"'' + ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon ] ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); - NIX_CFLAGS_COMPILE = [ - # This flag should be picked up through pkgconfig, but it isn't. - "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" - ]; - # cleanup: the build system creates (empty) $out/$out/share/icons (double prefix) # if DESTDIR is unset DESTDIR="/"; |