diff options
| author | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2014-12-05 20:13:41 +0100 |
|---|---|---|
| committer | Benno Fünfstück <benno.fuenfstueck@gmail.com> | 2014-12-05 20:14:50 +0100 |
| commit | e177e90b9b6daf03fc1e6b59a44be455e2a45880 (patch) | |
| tree | 3f875412ca82740ff250c8764894f256c1cd5373 /pkgs/applications/networking/browsers | |
| parent | effaa51680de618d656c906b33d9619c4a3166f9 (diff) | |
| download | nixlib-e177e90b9b6daf03fc1e6b59a44be455e2a45880.tar nixlib-e177e90b9b6daf03fc1e6b59a44be455e2a45880.tar.gz nixlib-e177e90b9b6daf03fc1e6b59a44be455e2a45880.tar.bz2 nixlib-e177e90b9b6daf03fc1e6b59a44be455e2a45880.tar.lz nixlib-e177e90b9b6daf03fc1e6b59a44be455e2a45880.tar.xz nixlib-e177e90b9b6daf03fc1e6b59a44be455e2a45880.tar.zst nixlib-e177e90b9b6daf03fc1e6b59a44be455e2a45880.zip | |
firefox-wrapper: use gstreamer hook
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index c3e1e86e5591..eba0deb627e4 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { categories = "Application;Network;WebBrowser;"; }; - buildInputs = [makeWrapper]; + buildInputs = [makeWrapper] ++ gst_plugins; buildCommand = '' if [ ! -x "${browser}/bin/${browserName}" ] @@ -32,7 +32,7 @@ stdenv.mkDerivation { --suffix-each LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ - --suffix-each GST_PLUGIN_PATH ':' "$gst_plugins" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" mkdir -p $out/share/applications @@ -49,7 +49,6 @@ stdenv.mkDerivation { # where to find the plugin in its tree. plugins = map (x: x + x.mozillaPlugin) plugins; libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs; - gst_plugins = map (x: x + "/lib/gstreamer-0.10") gst_plugins; gtk_modules = map (x: x + x.gtkModule) gtk_modules; meta = { |