From ee9998e3030d7abd81fbf8f1e11c798c14dd0a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 18 Jul 2008 07:45:48 +0000
Subject: [PATCH] Poppler data 0.2.0.

svn path=/nixpkgs/trunk/; revision=12376
---
 pkgs/data/misc/poppler-data/default.nix | 13 +++++++++----
 pkgs/top-level/all-packages.nix         |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index 854ca1cc49f..eb1d530dc00 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,11 +1,11 @@
-args: with args;
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-data-0.1.1";
+  name = "poppler-data-0.2.0";
 
   src = fetchurl {
-	url = http://poppler.freedesktop.org/poppler-data-0.1.1.tar.gz;
-    sha256 = "1hnfanqbhkjyjq0j8yfadgbcai9mggz09lzxnia2bbk4lhy9722a";
+    url = "http://poppler.freedesktop.org/${name}.tar.gz";
+    sha256 = "0cpa1krpd6xjbn1nv825z5p8v4cfcypdri4bhzvn2dnjy997x9k8";
   };
 
   installFlags = "prefix=\${out}";
@@ -16,4 +16,9 @@ stdenv.mkDerivation rec {
   substituteAll ${config_tool} \${out}/bin/${config_tool_name}
   chmod +x \${out}/bin/${config_tool_name}
   ";
+
+  meta = {
+    homepage = http://poppler.freedesktop.org/;
+    description = "Encoding files for Poppler, a PDF rendering library";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13e64b7a011..b12a0b46dfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5495,7 +5495,7 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
-  poppler_data = import ../data/misc/poppler-data {
+  popplerData = import ../data/misc/poppler-data {
     inherit fetchurl stdenv;
   };