Author: eelco
Date: Sat Sep 11 17:16:42 2010
New Revision: 23737
URL: https://svn.nixos.org/websvn/nix/?rev=23737&sc=1
Log:
* Updated gecko-mediaplayer and gnome-mplayer.
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
nixpkgs/trunk/pkgs/applications/video/gnome-mplayer/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
Sat Sep 11 14:20:46 2010 (r23736)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
Sat Sep 11 17:16:42 2010 (r23737)
@@ -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 @@
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";
Modified: nixpkgs/trunk/pkgs/applications/video/gnome-mplayer/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/gnome-mplayer/default.nix Sat Sep
11 14:20:46 2010 (r23736)
+++ nixpkgs/trunk/pkgs/applications/video/gnome-mplayer/default.nix Sat Sep
11 17:16:42 2010 (r23737)
@@ -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];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
