GNU Gnash 0.8.2, Agg 2.5.

svn path=/nixpkgs/trunk/; revision=11030

4 files changed, 40 insertions, 17 deletions

diff --git a/pkgs/applications/video/gnash/builder.sh b/pkgs/applications/video/gnash/builder.sh
index b90cec984296..b24a2cb58409 100644
--- a/pkgs/applications/video/gnash/builder.sh
+++ b/pkgs/applications/video/gnash/builder.sh
@@ -1,5 +1,5 @@
-source $stdenv/setup
+source "$stdenv/setup" || exit 1
 
-configureFlags="--with-sdl-mixer-incl=$SDL_mixer/include/SDL --with-sdl-incl=$SDL/include/SDL --with-plugindir=$out/plugins"
+configureFlags="--with-sdl-mixer-incl=$SDL_mixer/include/SDL --with-sdl-incl=$SDL/include/SDL --with-plugindir=$out/plugins --enable-gui=gtk"
 
 genericBuild
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index f23027158a46..4ca28fb164d6 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -1,17 +1,38 @@
-{stdenv, fetchurl, libX11, libXext, libXi, libXmu
+{ stdenv, fetchurl, libX11, libXext, libXi, libXmu
 , SDL, SDL_mixer, GStreamer
-, libogg, libxml2, libjpeg, mesa, libpng}:
+, libogg, libxml2, libjpeg, mesa, libpng
+, boost, freetype, agg, dbus, curl, pkgconfig
+, glib, gtk
+, lib}:
 
-stdenv.mkDerivation {
-  name = "gnash-0.7.2";
+stdenv.mkDerivation rec {
+  name = "gnash-0.8.2";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://gnu/gnash/0.7.2/gnash-0.7.2.tar.bz2;
-    md5 = "ccef0f45be01a4c2992b46c2363a514f";
+    url = "mirror://gnu/gnash/0.8.2/${name}.tar.bz2";
+    sha256 = "1akbs0wkgiawrjwwgp5w0cqn0qn3fcnfv40scjlrvdqrcqgfg0ac";
   };
 
+  patchPhase = ''
+    # Add all libs to `macros/libslist', a list of library search paths.
+    for lib in ${lib.concatStringsSep " "
+                                      (map (lib: "\"${lib}\"/lib")
+                                           (buildInputs ++ [stdenv.glibc]))}
+    do
+      echo -n "$lib " >> macros/libslist
+    done
+  '';
+
+  # XXX: KDE is supported as well so we could make it available optionally.
   buildInputs = [libX11 libXext libXi libXmu SDL SDL_mixer GStreamer
-                 libogg libxml2 libjpeg mesa libpng];
+                 libogg libxml2 libjpeg mesa libpng boost freetype agg
+		 dbus curl pkgconfig glib gtk];
   inherit SDL_mixer SDL;
+
+  meta = {
+    homepage = http://www.gnu.org/software/gnash/;
+    description = ''Gnash is the GNU Flash movie player.'';
+    license = "GPLv3+";
+  };
 } // {mozillaPlugin = "/plugins";}
diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index 2c85f401255c..bcdf4a644f5b 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl, autoconf, automake, libtool, pkgconfig}:
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig
+, freetype, SDL }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "agg-2.5";
   src = fetchurl {
-    url = http://www.antigrain.com/agg-2.5.tar.gz;
+    url = "http://www.antigrain.com/${name}.tar.gz";
     sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb";
   };
-  buildInputs = [autoconf automake libtool pkgconfig];
+  buildInputs = [autoconf automake libtool pkgconfig freetype SDL];
   preConfigure = "sh autogen.sh";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ac877f5899a..1f9c397fe16e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2192,11 +2192,10 @@ rec {
     inherit stdenv fetchurl autoconf libtool gettext attr;
   };
 
-  /*
   agg = import ../development/libraries/agg {
-    inherit fetchurl stdenv autoconf automake libtool pkgconfig;
+    inherit fetchurl stdenv autoconf automake libtool pkgconfig
+            freetype SDL;
   };
-  */
 
   apr = import ../development/libraries/apr {
     inherit fetchurl stdenv;
@@ -5112,7 +5111,9 @@ rec {
   };
 
   gnash = assert mesaSupported; import ../applications/video/gnash {
-    inherit fetchurl stdenv SDL SDL_mixer libogg libxml2 libjpeg mesa libpng;
+    inherit fetchurl stdenv SDL SDL_mixer libogg libxml2 libjpeg mesa libpng
+            boost freetype agg dbus curl pkgconfig lib;
+    inherit (gtkLibs) glib gtk;
     GStreamer = gst_all.gstreamer;
     inherit (xlibs) libX11 libXext libXi libXmu;
   };