From 7ce717a56cc2141bd6364938065b7bc33316f372 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 18 Aug 2016 12:46:58 +0300 Subject: poppler_data: install pkgconfig files --- pkgs/data/misc/poppler-data/default.nix | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'pkgs/data/misc') diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 59dd4da792bb4..beac810519938 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake }: +{ fetchurl, stdenv }: stdenv.mkDerivation rec { name = "poppler-data-0.4.7"; @@ -8,22 +8,17 @@ stdenv.mkDerivation rec { sha256 = "1pm7wg6xqj4sppb5az4pa7psfdk4yxxkw52j85bm9fksibcb0lp7"; }; - buildInputs = [ cmake ]; + postPatch = '' + sed -i 's,$(datadir)/pkgconfig,$(prefix)/lib/pkgconfig,g' Makefile + ''; -# 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 - ''; + installFlags = [ "prefix=$(out)" ]; - meta = { + meta = with stdenv.lib; { homepage = http://poppler.freedesktop.org/; description = "Encoding files for Poppler, a PDF rendering library"; - platforms = stdenv.lib.platforms.all; - license = stdenv.lib.licenses.free; # more free licenses combined - maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = platforms.all; + license = licenses.free; # more free licenses combined + maintainers = with maintainers; [ urkud ]; }; } -- cgit 1.4.1