Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into master

2018-02-26 13:05:32 +01:00
parent 754816b84b 8d490ca993
commit fc23242220
33 changed files with 389 additions and 267 deletions
@@ -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/;