Unverified Commit 3e815e63 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #314916 from Lord-Valen/zathura

zathura: 0.5.5 -> 0.5.6; zathura-pdf-mupdf: 0.4.1 -> 0.4.2
parents 0449b029 cca76d7c
Loading
Loading
Loading
Loading
+25 −6
Original line number Diff line number Diff line
{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core
, girara, gettext, libarchive }:
{
  stdenv,
  lib,
  fetchurl,
  meson,
  ninja,
  pkg-config,
  zathura_core,
  girara,
  gettext,
  libarchive,
}:

stdenv.mkDerivation rec {
  pname = "zathura-cb";
@@ -7,11 +17,20 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
    sha256 = "1j5v32f9ki35v1jc7a067anhlgqplzrp4fqvznlixfhcm0bwmc49";
    hash = "sha256-ibDKF6gMuh6p/Rs7cvOnFz8KrToGqMNk2GXEmZwYu8g=";
  };

  nativeBuildInputs = [ meson ninja pkg-config gettext ];
  buildInputs = [ libarchive zathura_core girara ];
  nativeBuildInputs = [
    meson
    ninja
    pkg-config
    gettext
  ];
  buildInputs = [
    libarchive
    zathura_core
    girara
  ];

  PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

+55 −17
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitLab, meson, ninja, wrapGAppsHook3, pkg-config, gitUpdater
, appstream-glib, json-glib, desktop-file-utils, python3
, gtk, girara, gettext, libxml2, check
, sqlite, glib, texlive, libintl, libseccomp
, file, librsvg
, gtk-mac-integration
{
  lib,
  stdenv,
  fetchFromGitHub,
  meson,
  ninja,
  wrapGAppsHook3,
  pkg-config,
  gitUpdater,
  appstream-glib,
  json-glib,
  desktop-file-utils,
  python3,
  gtk,
  girara,
  gettext,
  libxml2,
  check,
  sqlite,
  glib,
  texlive,
  libintl,
  libseccomp,
  file,
  librsvg,
  gtk-mac-integration,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "zathura";
  version = "0.5.5";
  version = "0.5.6";

  src = fetchFromGitLab {
    domain = "git.pwmt.org";
  src = fetchFromGitHub {
    owner = "pwmt";
    repo = "zathura";
    rev = finalAttrs.version;
    hash = "sha256-mHEYqgBB55p8nykFtvYtP5bWexp/IqFbeLs7gZmXCeE=";
    hash = "sha256-lTEBIZ3lkzjJ+L1qecrcL8iseo8AvSIo3Wh65/ikwac=";
  };

  outputs = [ "bin" "man" "dev" "out" ];
  outputs = [
    "bin"
    "man"
    "dev"
    "out"
  ];

  # Flag list:
  # https://github.com/pwmt/zathura/blob/master/meson_options.txt
@@ -33,22 +57,36 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  nativeBuildInputs = [
    meson ninja pkg-config desktop-file-utils python3.pythonOnBuildForHost.pkgs.sphinx
    gettext wrapGAppsHook3 libxml2 appstream-glib
    meson
    ninja
    pkg-config
    desktop-file-utils
    python3.pythonOnBuildForHost.pkgs.sphinx
    gettext
    wrapGAppsHook3
    libxml2
    appstream-glib
  ];

  buildInputs = [
    gtk girara libintl sqlite glib file librsvg check json-glib
    gtk
    girara
    libintl
    sqlite
    glib
    file
    librsvg
    check
    json-glib
    texlive.bin.core
  ] ++ lib.optional stdenv.isLinux libseccomp
    ++ lib.optional stdenv.isDarwin gtk-mac-integration;
  ] ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional stdenv.isDarwin gtk-mac-integration;

  doCheck = !stdenv.isDarwin;

  passthru.updateScript = gitUpdater { };

  meta = with lib; {
    homepage = "https://git.pwmt.org/pwmt/zathura";
    homepage = "https://pwmt.org/projects/zathura";
    description = "A core component for zathura PDF viewer";
    license = licenses.zlib;
    platforms = platforms.unix;
+8 −5
Original line number Diff line number Diff line
{ config, pkgs
{
  config,
  pkgs,
  # zathura_pdf_mupdf fails to load _opj_create_decompress at runtime on Darwin (https://github.com/NixOS/nixpkgs/pull/61295#issue-277982980)
, useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin) }:
  useMupdf ? config.zathura.useMupdf or (!pkgs.stdenv.isDarwin),
}:

let
  callPackage = pkgs.newScope self;
@@ -29,5 +32,5 @@ let
      ];
    };
  };

in self
in
self
+26 −5
Original line number Diff line number Diff line
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gtk, zathura_core, girara, djvulibre, gettext }:
{
  lib,
  stdenv,
  fetchurl,
  meson,
  ninja,
  pkg-config,
  gtk,
  zathura_core,
  girara,
  djvulibre,
  gettext,
}:

stdenv.mkDerivation rec {
  pname = "zathura-djvu";
@@ -6,11 +18,21 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
    sha256 = "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln";
    hash = "sha256-lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA=";
  };

  nativeBuildInputs = [ meson ninja pkg-config ];
  buildInputs = [ djvulibre gettext zathura_core gtk girara ];
  nativeBuildInputs = [
    meson
    ninja
    pkg-config
  ];
  buildInputs = [
    djvulibre
    gettext
    zathura_core
    gtk
    girara
  ];

  PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura";

@@ -26,4 +48,3 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ ];
  };
}
+29 −21
Original line number Diff line number Diff line
{ stdenv, lib, meson, ninja, fetchurl, cairo
, girara
, gtk-mac-integration
, gumbo
, jbig2dec
, libjpeg
, mupdf
, openjpeg
, pkg-config
, zathura_core
, tesseract
, leptonica
, mujs
, gitUpdater
{
  stdenv,
  lib,
  meson,
  ninja,
  fetchurl,
  cairo,
  girara,
  gtk-mac-integration,
  gumbo,
  jbig2dec,
  libjpeg,
  mupdf,
  openjpeg,
  pkg-config,
  zathura_core,
  tesseract,
  leptonica,
  mujs,
  gitUpdater,
}:

stdenv.mkDerivation rec {
  version = "0.4.1";
  version = "0.4.2";
  pname = "zathura-pdf-mupdf";

  src = fetchurl {
    url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
    hash = "sha256-+YKgHWUj+iVmk4EYTAamJe2/15YcvbBxHcz9ucQCrC8=";
    hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM=";
  };

  nativeBuildInputs = [ meson ninja pkg-config ];
  nativeBuildInputs = [
    meson
    ninja
    pkg-config
  ];

  buildInputs = [
    cairo
@@ -45,9 +55,7 @@ stdenv.mkDerivation rec {
    sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build
  '';

  passthru.updateScript = gitUpdater {
    url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git";
  };
  passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; };

  meta = with lib; {
    homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/";
Loading