summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-03-27 21:45:31 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-04-12 01:18:42 +0200
commit19608d872fa889183b37cec34d0edc3a91ad2516 (patch)
tree897f19c96c3c50b3c8935f949cf6e22a57c82628 /pkgs
parent5d62f72b21d07f59b70ddd957a578a229dc088d2 (diff)
downloadnixpkgs-19608d872fa889183b37cec34d0edc3a91ad2516.tar
nixpkgs-19608d872fa889183b37cec34d0edc3a91ad2516.tar.gz
nixpkgs-19608d872fa889183b37cec34d0edc3a91ad2516.tar.bz2
nixpkgs-19608d872fa889183b37cec34d0edc3a91ad2516.tar.lz
nixpkgs-19608d872fa889183b37cec34d0edc3a91ad2516.tar.xz
nixpkgs-19608d872fa889183b37cec34d0edc3a91ad2516.tar.zst
nixpkgs-19608d872fa889183b37cec34d0edc3a91ad2516.zip
zathura_pdf_poppler: 0.2.8 → 0.2.9
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/zathura/pdf-poppler/default.nix21
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 215ebdd7564..663e798ee0b 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,28 +1,21 @@
-{ stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }:
+{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.8";
+  version = "0.2.9";
   name = "zathura-pdf-poppler-${version}";
 
   src = fetchurl {
-    url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2";
+    url = "https://pwmt.org/projects/zathura/plugins/download/${name}.tar.xz";
+    sha256 = "1p4jcny0jniygns78mcf0nlm298dszh49qpmjmackrm6dq8hc25y";
   };
 
-  nativeBuildInputs = [ pkgconfig zathura_core ];
+  nativeBuildInputs = [ meson ninja pkgconfig zathura_core ];
   buildInputs = [ poppler girara ];
 
-  makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
-
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    string1='-shared ''${LDFLAGS} -o $@ ''$(OBJECTS) ''${LIBS}'
-    string2='-Wl,-dylib_install_name,''${PLUGIN}.dylib -Wl,-bundle_loader,${zathura_core}/bin/.zathura-wrapped -bundle ''${LDFLAGS} -o $@ ''${OBJECTS} ''${LIBS}'
-    makefileC1=$(sed -r 's/\.so/.dylib/g' Makefile)
-    echo "''${makefileC1/$string1/$string2}" > Makefile
-  '';
+  PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";
 
   meta = with lib; {
-    homepage = http://pwmt.org/projects/zathura/;
+    homepage = https://pwmt.org/projects/zathura-pdf-poppler/;
     description = "A zathura PDF plugin (poppler)";
     longDescription = ''
       The zathura-pdf-poppler plugin adds PDF support to zathura by