From b63de97e4cedd5722949c25e187b4222274a04a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 11 Sep 2010 17:16:42 +0000 Subject: [PATCH] * Updated gecko-mediaplayer and gnome-mplayer. svn path=/nixpkgs/trunk/; revision=23737 --- .../mozilla-plugins/gecko-mediaplayer/default.nix | 12 +++++------- pkgs/applications/video/gnome-mplayer/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix index 6c08f127818..d50486cd742 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix @@ -3,19 +3,19 @@ }: stdenv.mkDerivation rec { - name = "gecko-mediaplayer-0.9.6"; + name = "gecko-mediaplayer-0.9.99.rc1"; src = fetchurl { url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz"; - sha256 = "1847jv1v9r4xzmvksvjvl2fmp8j5s22hx922hywdflzzq7jsgyr7"; + sha256 = "1ddp8z2a40wxdj7v20wqph9l4z4a47bjqzac7wlmmzjq7a9pbij2"; }; - buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf]; + buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner]; # !!! fix this preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser.xulrunner}/include/xulrunner-*/stable) -I${browser.nspr}/include/nspr" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser.xulrunner}/include/xulrunner-*) -I${browser.nspr}/include/nspr" echo $NIX_CFLAGS_COMPILE ''; @@ -26,9 +26,7 @@ stdenv.mkDerivation rec { echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path ''; - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; + passthru.mozillaPlugin = "/lib/mozilla/plugins"; meta = { description = "A browser plugin that uses GNOME MPlayer to play media in a browser"; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index c80ba1d3b89..0d86e902efd 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}: stdenv.mkDerivation rec { - name = "gnome-mplayer-0.9.6"; + name = "gnome-mplayer-0.9.99.rc1"; src = fetchurl { url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz"; - sha256 = "0gvciiy50y4vc9r6nlmw1q2fgwkywk0cq8rviswd6wbrxvz2gv2x"; + sha256 = "00fbcjpashrld8bpvm63q9ms17kjnj3rrn1ghsfyqi2swpwzk2k1"; }; buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf];