From 27bef25b17953d9749d50b6917d712172ab8e6ea Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <cillian.deroiste@gmail.com>
Date: Mon, 4 Jun 2012 17:38:47 +0000
Subject: [PATCH] Applying the patch from Rok Garbas to add GIMP 2.8.0

svn path=/nixpkgs/trunk/; revision=34352
---
 pkgs/applications/graphics/gimp/2.8.0.nix     | 33 +++++++++++++++++++
 pkgs/development/libraries/babl/0.1.10.nix    | 16 +++++++++
 pkgs/development/libraries/gegl/0.2.0.nix     | 24 ++++++++++++++
 .../development/libraries/geoclue/default.nix |  2 +-
 pkgs/top-level/all-packages.nix               | 12 +++++++
 5 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/graphics/gimp/2.8.0.nix
 create mode 100644 pkgs/development/libraries/babl/0.1.10.nix
 create mode 100644 pkgs/development/libraries/gegl/0.2.0.nix

diff --git a/pkgs/applications/graphics/gimp/2.8.0.nix b/pkgs/applications/graphics/gimp/2.8.0.nix
new file mode 100644
index 000000000000..bf29ae13e5e7
--- /dev/null
+++ b/pkgs/applications/graphics/gimp/2.8.0.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf
+, pango, cairo, freetype, fontconfig, lcms2, libpng, libjpeg, poppler, libtiff
+, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
+, python, pygtk, libart_lgpl, libexif, gettext, xlibs }:
+
+stdenv.mkDerivation rec {
+  name = "gimp-2.8.0";
+  
+  src = fetchurl {
+    url = "ftp://ftp.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
+    md5 = "28997d14055f15db063eb92e1c8a7ebb";
+  };
+  
+  buildInputs = 
+    [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo
+      freetype fontconfig lcms2 libpng libjpeg poppler libtiff webkit
+      libmng librsvg libwmf zlib libzip ghostscript aalib jasper
+      python pygtk libart_lgpl libexif gettext 
+    ];
+
+  passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ?
+
+  #configureFlags = [ "--disable-print" ];
+
+  # "screenshot" needs this.
+  NIX_LDFLAGS = "-rpath ${xlibs.libX11}/lib";
+
+  meta = {
+    description = "The GNU Image Manipulation Program";
+    homepage = http://www.gimp.org/;
+    license = "GPL";
+  };
+}
diff --git a/pkgs/development/libraries/babl/0.1.10.nix b/pkgs/development/libraries/babl/0.1.10.nix
new file mode 100644
index 000000000000..41280e87253d
--- /dev/null
+++ b/pkgs/development/libraries/babl/0.1.10.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "babl-0.1.10";
+
+  src = fetchurl {
+    url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
+    sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4";
+  };
+
+  meta = { 
+    description = "Image pixel format conversion library";
+    homepage = http://gegl.org/babl/;
+    license = "GPL3";
+  };
+}
diff --git a/pkgs/development/libraries/gegl/0.2.0.nix b/pkgs/development/libraries/gegl/0.2.0.nix
new file mode 100644
index 000000000000..5da6e3e40f4c
--- /dev/null
+++ b/pkgs/development/libraries/gegl/0.2.0.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
+, librsvg, pango, gtk, bzip2, intltool }:
+        
+stdenv.mkDerivation rec {
+  name = "gegl-0.2.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2";
+    sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
+  };
+
+  # needs fonts otherwise  don't know how to pass them
+  configureFlags = "--disable-docs";
+
+  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ];
+
+  buildNativeInputs = [ pkgconfig ];
+
+  meta = { 
+    description = "Graph-based image processing framework";
+    homepage = http://www.gegl.org;
+    license = "GPL3";
+  };
+}
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index c5c8b694ba9c..4c5d17eca997 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -14,7 +14,7 @@ let
     baseName="geoclue";
     version="0.12.0";
     name="${baseName}-${version}";
-    url="http://folks.o-hand.com/jku/geoclue-releases/${name}.tar.gz";
+    url="https://launchpad.net/geoclue/trunk/0.12/+download/${name}.tar.gz";
     hash="15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
   };
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9850ce2b00e3..1b89c56e841d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3180,6 +3180,8 @@ let
 
   babl = callPackage ../development/libraries/babl { };
 
+  babl_0_1_10 = callPackage ../development/libraries/babl/0.1.10.nix {};
+
   beecrypt = callPackage ../development/libraries/beecrypt { };
 
   boehmgc = callPackage ../development/libraries/boehm-gc { };
@@ -3436,6 +3438,10 @@ let
     #  avocodec avformat librsvg
   };
 
+  gegl_0_2_0 = callPackage ../development/libraries/gegl/0.2.0.nix {
+    babl = babl_0_1_10;
+  };
+
   geoclue = callPackage ../development/libraries/geoclue {};
 
   geoip = builderDefsPackage ../development/libraries/geoip {
@@ -6763,6 +6769,12 @@ let
     inherit (gnome) libart_lgpl;
   };
 
+  gimp_2_8_0 = callPackage ../applications/graphics/gimp/2.8.0.nix {
+    inherit (gnome) libart_lgpl;
+    babl = babl_0_1_10;
+    gegl = gegl_0_2_0;
+  };
+
   gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {
     inherit pkgs gimp;
   });