From 325a0370a7b126c074a3817ed8b9d3944a67744b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 2 Oct 2010 05:24:33 +0000
Subject: poppler-data-0.4.3

svn path=/nixpkgs/trunk/; revision=24025
---
 pkgs/data/misc/poppler-data/default.nix      | 23 ++++++++++++-----------
 pkgs/data/misc/poppler-data/poppler-data-dir |  2 --
 2 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/data/misc/poppler-data/poppler-data-dir

(limited to 'pkgs/data/misc/poppler-data')

diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index 68e3e9a32e8f..b121d30824e9 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,24 +1,25 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-data-0.2.1";
+  name = "poppler-data-0.4.3";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "0q56l5v89pnpkm1kqmwb1sx2zcx89q6bxz2hq2cpkq5f8kgvl3c9";
+    sha256 = "19jq5miinzzrzlv6696j82hr60ga2r4msk6a34s9537vid410q22";
   };
 
-  installFlags = "prefix=\${out}";
-  config_tool_name = "poppler-data-dir";
-  config_tool = ./poppler-data-dir;
-  postInstall = "
-  ensureDir \${out}/bin
-  substituteAll ${config_tool} \${out}/bin/${config_tool_name}
-  chmod +x \${out}/bin/${config_tool_name}
-  ";
+  buildInputs = [ cmake ];
+
+  postInstall = ''
+    ensureDir ''${out}/etc/profile.d
+    echo "export POPPLER_DATADIR=''${out}/share/poppler" > \
+      ''${out}/etc/profile.d/60-poppler.sh
+  '';
 
   meta = {
     homepage = http://poppler.freedesktop.org/;
     description = "Encoding files for Poppler, a PDF rendering library";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
diff --git a/pkgs/data/misc/poppler-data/poppler-data-dir b/pkgs/data/misc/poppler-data/poppler-data-dir
deleted file mode 100644
index 0d86f5426204..000000000000
--- a/pkgs/data/misc/poppler-data/poppler-data-dir
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo -n export POPPLER_DATADIR=@out@/share/poppler
-- 
cgit 1.4.1