Merge pull request #22832 from rnhmjoj/zathura

zathura: 0.3.6 -> 0.3.7

authored by Arseniy Seroka and committed by GitHub c16bfb8a e6ea1041

+22 -15
+22 -15
pkgs/applications/misc/zathura/core/default.nix
··· 1 - { stdenv, lib, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils 2 - , file, makeWrapper, sqlite, glib 3 - , synctexSupport ? true, texlive ? null }: 1 + { stdenv, fetchurl, makeWrapper, pkgconfig 2 + , gtk, girara, ncurses, gettext, docutils 3 + , file, sqlite, glib, texlive 4 + , synctexSupport ? true 5 + }: 4 6 5 7 assert synctexSupport -> texlive != null; 8 + 9 + with stdenv.lib; 6 10 7 11 stdenv.mkDerivation rec { 8 - version = "0.3.6"; 9 - name = "zathura-core-${version}"; 12 + name = "zathura-core-${version}"; 13 + version = "0.3.7"; 10 14 11 15 src = fetchurl { 12 - url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; 13 - sha256 = "0fyb5hak0knqvg90rmdavwcmilhnrwgg1s5ykx9wd3skbpi8nsh8"; 16 + url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; 17 + sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2"; 14 18 }; 15 19 16 20 icon = ./icon.xpm; 17 21 18 - buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib 19 - ] ++ lib.optional synctexSupport texlive.bin.core; 22 + buildInputs = [ 23 + pkgconfig file gtk girara 24 + gettext makeWrapper sqlite glib 25 + ] ++ optional synctexSupport texlive.bin.core; 20 26 21 27 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; 22 28 ··· 25 31 "RSTTOMAN=${docutils}/bin/rst2man.py" 26 32 "VERBOSE=1" 27 33 "TPUT=${ncurses.out}/bin/tput" 28 - ] ++ lib.optional synctexSupport "WITH_SYNCTEX=1"; 34 + (optionalString synctexSupport "WITH_SYNCTEX=1") 35 + ]; 29 36 30 37 postInstall = '' 31 38 wrapProgram "$out/bin/zathura" \ 32 - --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ 39 + --prefix PATH ":" "${makeBinPath [ file ]}" \ 33 40 --prefix XDG_CONFIG_DIRS ":" "$out/etc" 34 41 35 42 install -Dm644 $icon $out/share/pixmaps/pwmt.xpm ··· 38 45 echo "Icon=pwmt" >> $out/share/applications/zathura.desktop 39 46 ''; 40 47 41 - meta = with stdenv.lib; { 42 - homepage = http://pwmt.org/projects/zathura/; 48 + meta = { 49 + homepage = http://pwmt.org/projects/zathura/; 43 50 description = "A core component for zathura PDF viewer"; 44 - license = licenses.zlib; 45 - platforms = platforms.linux; 51 + license = licenses.zlib; 52 + platforms = platforms.linux; 46 53 maintainers = with maintainers; [ garbas ]; 47 54 }; 48 55 }