diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-08-03 05:11:30 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-08-03 05:11:30 +0000 |
| commit | 30d143f0d8aa1b7c6625cd2c58f2385b504f81dc (patch) | |
| tree | 0251c8a9186fd1565d5225861013000bcbb9dffd /pkgs | |
| parent | fd557980cd49bd53bab257ac5860bf56e0bed3d6 (diff) | |
| download | nixpkgs-30d143f0d8aa1b7c6625cd2c58f2385b504f81dc.tar nixpkgs-30d143f0d8aa1b7c6625cd2c58f2385b504f81dc.tar.gz nixpkgs-30d143f0d8aa1b7c6625cd2c58f2385b504f81dc.tar.bz2 nixpkgs-30d143f0d8aa1b7c6625cd2c58f2385b504f81dc.tar.lz nixpkgs-30d143f0d8aa1b7c6625cd2c58f2385b504f81dc.tar.xz nixpkgs-30d143f0d8aa1b7c6625cd2c58f2385b504f81dc.tar.zst nixpkgs-30d143f0d8aa1b7c6625cd2c58f2385b504f81dc.zip | |
Try to handle GStreamer correctly in webkit
svn path=/nixpkgs/trunk/; revision=16544
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/uzbl/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/webkit/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index d9f5c89f08b..09ab0b7ce6c 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -18,7 +18,15 @@ rec { configureFlags = []; /* doConfigure should be removed if not needed */ - phaseNames = ["doMakeInstall"]; + phaseNames = ["doMakeInstall" "doWrap"]; + + doWrap = a.makeManyWrappers "$out/bin/uzbl" + '' + --prefix GST_PLUGIN_PATH : ${webkit.gstreamer}/lib/gstreamer-* + --prefix GST_PLUGIN_PATH : ${webkit.gstPluginsBase}/lib/gstreamer-* + --prefix GST_PLUGIN_PATH : ${webkit.gstPluginsGood}/lib/gstreamer-* + --prefix GST_PLUGIN_PATH : ${webkit.gstFfmpeg}/lib/gstreamer-* + ''; installFlags = "PREFIX=$out"; diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 9a1df094511..dd518fb7fd6 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -10,7 +10,11 @@ rec { gettext libjpeg libpng libtiff libxml2 libxslt pango sqlite icu gperf bison flex autoconf automake libtool perl intltool pkgconfig libsoup gtkdoc libXt libproxy - enchant gstreamer gstPluginsBase gstFfmpeg + enchant + ]; + + propagatedBuildInputs = [ + gstreamer gstPluginsBase gstFfmpeg gstPluginsGood ]; configureCommand = "./autogen.sh "; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a794a1dfdce..0a5e1c85683 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4052,7 +4052,8 @@ let libjpeg libtiff libpng libxml2 libxslt sqlite icu cairo perl intltool automake libtool pkgconfig autoconf bison libproxy enchant; - inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg; + inherit (gst_all) gstreamer gstPluginsBase gstFfmpeg + gstPluginsGood; flex = flex2535; inherit (xlibs) libXt; }; |