diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:54:48 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:54:48 +0100 |
commit | e2243a5ac95826b5b8c23c77c3562d81e5146b29 (patch) | |
tree | 33d8ef0aba3901552ea3579b19ea5e3bf718f1bb /pkgs/data | |
parent | f5ce8f86dfa0a9f9dfe63462161f5ba982e57738 (diff) | |
download | nixlib-e2243a5ac95826b5b8c23c77c3562d81e5146b29.tar nixlib-e2243a5ac95826b5b8c23c77c3562d81e5146b29.tar.gz nixlib-e2243a5ac95826b5b8c23c77c3562d81e5146b29.tar.bz2 nixlib-e2243a5ac95826b5b8c23c77c3562d81e5146b29.tar.lz nixlib-e2243a5ac95826b5b8c23c77c3562d81e5146b29.tar.xz nixlib-e2243a5ac95826b5b8c23c77c3562d81e5146b29.tar.zst nixlib-e2243a5ac95826b5b8c23c77c3562d81e5146b29.zip |
Revert "Revert "Merge staging at '8d490ca9934d0' into master""
This reverts commit f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/misc/poppler-data/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index f0f6505cb247..5c8e0970518b 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,18 +1,14 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, cmake, ninja }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.7"; + name = "poppler-data-0.4.8"; src = fetchurl { url = "http://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "1pm7wg6xqj4sppb5az4pa7psfdk4yxxkw52j85bm9fksibcb0lp7"; + sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh"; }; - postPatch = '' - sed -i 's,$(datadir)/pkgconfig,$(prefix)/lib/pkgconfig,g' Makefile - ''; - - installFlags = [ "prefix=$(out)" ]; + nativeBuildInputs = [ cmake ninja ]; meta = with stdenv.lib; { homepage = https://poppler.freedesktop.org/; |