From 63959f2a5aa7a337b569ed8a3b6a0a236100b1f2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 19 Sep 2011 08:35:30 +0000
Subject: Let poppler use ${POPPLER_DATADIR}

Also upgrade poppler-data

svn path=/nixpkgs/trunk/; revision=29342
---
 pkgs/data/misc/poppler-data/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(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 b121d30824e9..14a41cf84fc9 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,20 +1,23 @@
 { fetchurl, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-data-0.4.3";
+  name = "poppler-data-0.4.5";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "19jq5miinzzrzlv6696j82hr60ga2r4msk6a34s9537vid410q22";
+    sha256 = "1zbh1zd083wfwrcw7vxc2bn32h42y6iyh24syxcb3r5ggd2vr41i";
   };
 
   buildInputs = [ cmake ];
 
-  postInstall = ''
-    ensureDir ''${out}/etc/profile.d
-    echo "export POPPLER_DATADIR=''${out}/share/poppler" > \
-      ''${out}/etc/profile.d/60-poppler.sh
-  '';
+# TODO: actually use $prefix/etc/profile.d in NixOS
+  postInstall =
+    ''
+      mkdir -pv ''${out}/etc/profile.d
+      echo "export POPPLER_DATADIR=''${out}/share/poppler" |
+        tee ''${out}/etc/profile.d/60-poppler.sh
+      chmod -c +x ''${out}/etc/profile.d/60-poppler.sh
+    '';
 
   meta = {
     homepage = http://poppler.freedesktop.org/;
-- 
cgit 1.4.1