diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix
index bcdf4a644f5b..9ef13735b084 100644
--- a/pkgs/development/libraries/agg/default.nix
+++ b/pkgs/development/libraries/agg/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig
-, freetype, SDL }:
+, freetype, SDL, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "agg-2.5";
@@ -7,6 +7,25 @@ stdenv.mkDerivation rec {
     url = "http://www.antigrain.com/${name}.tar.gz";
     sha256 = "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb";
   };
-  buildInputs = [autoconf automake libtool pkgconfig freetype SDL];
+  buildInputs = [ autoconf automake libtool pkgconfig freetype SDL libX11 ];
   preConfigure = "sh autogen.sh";
+
+  configureFlags = "--x-includes=${libX11}/include --x-libraries=${libX11}/lib";
+
+  meta = {
+    description = "The Anti-Grain Geometry (AGG) library, a high quality rendering engine for C++";
+
+    longDescription = ''
+      Anti-Grain Geometry (AGG) is an Open Source, free of charge
+      graphic library, written in industrially standard C++.  The
+      terms and conditions of use AGG are described on The License
+      page.  AGG doesn't depend on any graphic API or technology.
+      Basically, you can think of AGG as of a rendering engine that
+      produces pixel images in memory from some vectorial data.  But
+      of course, AGG can do much more than that.
+    '';
+
+    license = "GPLv2+";
+    homepage = http://www.antigrain.com/;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd29f293e284..b0afd0e04e57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2668,7 +2668,8 @@ let
 
   agg = import ../development/libraries/agg {
     inherit fetchurl stdenv autoconf automake libtool pkgconfig
-            freetype SDL;
+      freetype SDL;
+    inherit (xlibs) libX11;
   };
 
   apr = import ../development/libraries/apr {