JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Updated gecko-mediaplayer and gnome-mplayer.

Browse Source 
svn path=/nixpkgs/trunk/; revision=23737
This commit is contained in:
Eelco Dolstra 2010-09-11 17:16:42 +00:00
parent bf7c353ad1
commit b63de97e4c
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
View File

@ -3,19 +3,19 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gecko-mediaplayer-0.9.6"; name = "gecko-mediaplayer-0.9.99.rc1";
src = fetchurl { src = fetchurl {
url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz"; 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 # !!! fix this
preBuild = 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 echo $NIX_CFLAGS_COMPILE
''; '';
@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path echo "${gnome_mplayer}/bin:${MPlayer}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
''; '';
passthru = { passthru.mozillaPlugin = "/lib/mozilla/plugins";
mozillaPlugin = "/lib/mozilla/plugins";
};
meta = { meta = {
description = "A browser plugin that uses GNOME MPlayer to play media in a browser"; description = "A browser plugin that uses GNOME MPlayer to play media in a browser";

4
pkgs/applications/video/gnome-mplayer/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}: {stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-mplayer-0.9.6"; name = "gnome-mplayer-0.9.99.rc1";
src = fetchurl { src = fetchurl {
url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz"; url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz";
sha256 = "0gvciiy50y4vc9r6nlmw1q2fgwkywk0cq8rviswd6wbrxvz2gv2x"; sha256 = "00fbcjpashrld8bpvm63q9ms17kjnj3rrn1ghsfyqi2swpwzk2k1";
}; };
buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf]; buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf];