summary refs log tree commit diff
path: root/pkgs/data/misc
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2010-10-02 05:24:33 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2010-10-02 05:24:33 +0000
commit325a0370a7b126c074a3817ed8b9d3944a67744b (patch)
tree88da6ed30ec6cfe35cc22fccf827a1d815931b0a /pkgs/data/misc
parent23bd7045301397447c44857d1683541e21e26f2d (diff)
downloadnixpkgs-325a0370a7b126c074a3817ed8b9d3944a67744b.tar
nixpkgs-325a0370a7b126c074a3817ed8b9d3944a67744b.tar.gz
nixpkgs-325a0370a7b126c074a3817ed8b9d3944a67744b.tar.bz2
nixpkgs-325a0370a7b126c074a3817ed8b9d3944a67744b.tar.lz
nixpkgs-325a0370a7b126c074a3817ed8b9d3944a67744b.tar.xz
nixpkgs-325a0370a7b126c074a3817ed8b9d3944a67744b.tar.zst
nixpkgs-325a0370a7b126c074a3817ed8b9d3944a67744b.zip
poppler-data-0.4.3
svn path=/nixpkgs/trunk/; revision=24025
Diffstat (limited to 'pkgs/data/misc')
-rw-r--r--pkgs/data/misc/poppler-data/default.nix23
-rw-r--r--pkgs/data/misc/poppler-data/poppler-data-dir2
2 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index 68e3e9a32e8..b121d30824e 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 0d86f542620..00000000000
--- 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