Author: simons
Date: Thu Feb 23 18:32:42 2012
New Revision: 32518
URL: https://nixos.org/websvn/nix/?rev=32518&sc=1
Log:
gecko-mediaplayer: updated to version 1.0.5
I hoped this update would fix the build errors, but in fact it didn't. :-(
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.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
Thu Feb 23 18:07:09 2012 (r32517)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
Thu Feb 23 18:32:42 2012 (r32518)
@@ -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 =
Added:
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix
Thu Feb 23 18:32:42 2012 (r32518)
@@ -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 ];
+}
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Feb 23 18:07:09
2012 (r32517)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Feb 23 18:32:42
2012 (r32518)
@@ -6929,6 +6929,11 @@
gqview = callPackage ../applications/graphics/gqview { };
+ gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk {
+ inherit (gnome) GConf;
+ inherit (gtkLibs) gtk;
+ };
+
googleearth = callPackage_i686 ../applications/misc/googleearth { };
google_talk_plugin = callPackage
../applications/networking/browsers/mozilla-plugins/google-talk-plugin {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits