From 1adacdf15087e05025bdbe3e913ffc9273c4f7de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 31 Aug 2007 13:14:20 +0000
Subject: [PATCH] * Make screenshots work in the Gimp, add it to the channel.

svn path=/nixpkgs/trunk/; revision=9229
---
 pkgs/applications/graphics/gimp/default.nix | 22 ++++++++++++++++-----
 pkgs/top-level/all-packages.nix             |  3 ++-
 pkgs/top-level/build-for-release.nix        |  1 +
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index c8800d7a648..58444075f98 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,6 +1,7 @@
-{stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype
+{ stdenv, fetchurl, pkgconfig, gtk, libgtkhtml, freetype
 , fontconfig, libart_lgpl, libtiff, libjpeg, libpng, libexif, zlib, perl
-, perlXMLParser, python, pygtk, gettext}:
+, perlXMLParser, python, pygtk, gettext, xlibs
+}:
 
 stdenv.mkDerivation {
   name = "gimp-2.4.0-rc1";
@@ -9,9 +10,20 @@ stdenv.mkDerivation {
     sha256 = "0n9gfmmxjjhi4dpdfwc37z8n4zsyx6byil1ig27agjgic22bydm1" ;
   };
   
-  buildInputs = [ pkgconfig gtk libgtkhtml freetype fontconfig
-                  libart_lgpl libtiff libjpeg libpng libexif zlib perl
-                   perlXMLParser python pygtk gettext ] ;
+  buildInputs = [
+    pkgconfig gtk libgtkhtml freetype fontconfig
+    libart_lgpl libtiff libjpeg libpng libexif zlib perl
+    perlXMLParser python pygtk gettext
+  ];
 
   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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 922a0772745..1a941d0514c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3124,7 +3124,8 @@ rec {
 
   gimp = import ../applications/graphics/gimp {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
-      libtiff libjpeg libpng libexif zlib perl perlXMLParser python pygtk gettext;
+      libtiff libjpeg libpng libexif zlib perl perlXMLParser
+      python pygtk gettext xlibs;
     inherit (gnome) gtk libgtkhtml libart_lgpl;
   };
 
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 5d3e91c5d25..2f390ab81a0 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -61,6 +61,7 @@ let {
     gdb
     ghc
     ghostscript
+    gimp
     gnugrep
     gnum4
     gnumake