about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2012-02-23 18:32:42 +0000
committerPeter Simons <simons@cryp.to>2012-02-23 18:32:42 +0000
commit31e7a2ce7a0caa65095468709791e658944e2ef5 (patch)
treedcecca8895090f0d640a603fb91ccb4287092204 /pkgs/applications
parent1ee7c4250ffce7fad5749bee0de5530425052dce (diff)
gecko-mediaplayer: updated to version 1.0.5
I hoped this update would fix the build errors, but in fact it didn't. :-(

svn path=/nixpkgs/trunk/; revision=32518
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix8
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix13
2 files changed, 17 insertions, 4 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 ddb70e6d633e1..0ff7c92d3d895 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, browser, x11
-, GConf, gnome_mplayer, MPlayer
+, GConf, gnome_mplayer, MPlayer, gmtk
 }:
 
 stdenv.mkDerivation rec {
-  name = "gecko-mediaplayer-1.0.4";
+  name = "gecko-mediaplayer-1.0.5";
 
   src = fetchurl {
     url = "http://gecko-mediaplayer.googlecode.com/files/${name}.tar.gz";
-    sha256 = "18asxxsqng303cxcww75k4r6syqjs7lylibv997kq0869kz4spsp";
+    sha256 = "913fd39e70c564cb210c2544a88869f9d1a448184421f000b14b2bc5ba718b49";
   };
 
-  buildInputs = [pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner];
+  buildInputs = [ pkgconfig glib dbus dbus_glib browser x11 GConf browser.xulrunner gmtk ];
 
   # !!! fix this
   preBuild =
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
new file mode 100644
index 0000000000000..6ccab87ebe743
--- /dev/null
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }:
+
+stdenv.mkDerivation rec {
+  name = "gmtk-1.0.5";
+
+  src = fetchurl {
+    url = "http://gmtk.googlecode.com/files/${name}.tar.gz";
+    sha256 = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468";
+  };
+
+  buildInputs = [ intltool pkgconfig gtk GConf alsaLib ];
+}
+