diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
| commit | ad35019501e6b263e08ecb4c66f1ee6e3eee80f1 (patch) | |
| tree | 492149cd4a5da50945a5bc7d5fa62de432590dea /pkgs/applications/misc/zathura/core/default.nix | |
| parent | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (diff) | |
| parent | 97e376bf9cafa2d6c812221677f2e38163d0acb8 (diff) | |
| download | nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.gz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.bz2 nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.lz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.xz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.zst nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.zip | |
Merge branch 'master' into staging
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
Diffstat (limited to 'pkgs/applications/misc/zathura/core/default.nix')
| -rw-r--r-- | pkgs/applications/misc/zathura/core/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 84dc14451532..415995a828d6 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja, makeWrapper, pkgconfig +{ stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig , appstream-glib, desktop-file-utils, python3 , gtk, girara, ncurses, gettext, libxml2 , file, sqlite, glib, texlive, libintl, libseccomp @@ -11,20 +11,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "zathura-core-${version}"; - version = "0.3.9"; + version = "0.4.0"; src = fetchurl { url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"; - sha256 = "0z09kz92a2n8qqv3cy8bx5j5k612g2f9mmh4szqlc7yvi39aax1g"; + sha256 = "1j0yah09adv3bsjhhbqra5lambal32svk8fxmf89wwmcqrcr4qma"; }; - patches = [ - (fetchpatch { - url = https://git.pwmt.org/pwmt/zathura/commit/4223464db68529f9a2064ed760fb7746b3c0df6b.patch; - sha256 = "004j68b7c8alxzyx0d80lr5i43cgh7lbqm5fx3d77ihci7hdmxnw"; - }) - ]; - nativeBuildInputs = [ meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx gettext makeWrapper libxml2 |