Unverified Commit b89f69d1 authored by Robin Gloster's avatar Robin Gloster Committed by GitHub
Browse files

zathura: 0.5.8 -> 0.5.11 (#365255)

parents 5b68fa0d c9f841f4

pkgs/applications/misc/girara/default.nix

+9 −10
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitLab,

  fetchFromGitHub,

  meson,

  ninja,

  pkg-config,
@@ -19,19 +19,18 @@ 


stdenv.mkDerivation rec {

  pname = "girara";

  version = "0.4.3";

  version = "0.4.5";



  outputs = [

    "out"

    "dev"

  ];



  src = fetchFromGitLab {

    domain = "git.pwmt.org";

  src = fetchFromGitHub {

    owner = "pwmt";

    repo = "girara";

    rev = version;

    hash = "sha256-/bJXdLXksTxUFC3w7zuBZY6Zh7tJxUJVbS87ENDQbDE=";

    tag = version;

    hash = "sha256-XjRmGgljlkvxwcbPmA9ZFAPAjbClSQDdmQU/GFeLLxI=";

  };



  nativeBuildInputs = [
@@ -79,15 +78,15 @@ stdenv.mkDerivation rec { 
    inherit zathura;

  };



  meta = with lib; {

    homepage = "https://git.pwmt.org/pwmt/girara";

  meta = {

    homepage = "https://pwmt.org/projects/girara";

    description = "User interface library";

    longDescription = ''

      girara is a library that implements a GTK based VIM-like user interface

      that focuses on simplicity and minimalism.

    '';

    license = licenses.zlib;

    platforms = platforms.linux ++ platforms.darwin;

    license = lib.licenses.zlib;

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

    maintainers = [ ];

  };

}

pkgs/applications/misc/zathura/core/default.nix

+5 −17
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  fetchurl,

  meson,

  ninja,

  wrapGAppsHook3,
@@ -33,24 +32,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "zathura";

  version = "0.5.8";

  version = "0.5.11";



  src = fetchFromGitHub {

    owner = "pwmt";

    repo = "zathura";

    rev = finalAttrs.version;

    hash = "sha256-k6DEJpUA3s0mGxE38aYnX7uea98LrzevJhWW1abHo/c=";

  src = fetchurl {

    url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";

    hash = "sha256-VEWKmZivD7j67y6TSoESe75LeQyG3NLIuPMjZfPRtTw=";

  };



  patches = [

    # https://github.com/pwmt/zathura/issues/664

    (fetchpatch {

      name = "fix-build-on-macos.patch";

      url = "https://github.com/pwmt/zathura/commit/53f151f775091abec55ccc4b63893a8f9a668588.patch";

      hash = "sha256-d8lRdlBN1Kfw/aTjz8x0gvTKy+SqSYWHLQCjV7hF5MI=";

    })

  ];



  outputs = [

    "bin"

    "man"

pkgs/applications/misc/zathura/wrapper.nix

+13 −7
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
    zathura_cb

    (if useMupdf then zathura_pdf_mupdf else zathura_pdf_poppler)

  ],

  stdenv,

}:

symlinkJoin {

  inherit (zathura_core) version;
@@ -36,7 +37,12 @@ symlinkJoin { 
    let

      fishCompletion = "share/fish/vendor_completions.d/zathura.fish";

    in

    ''

    (lib.optionalString stdenv.hostPlatform.isLinux ''

      makeWrapper ${zathura_core.bin}/bin/zathura-sandbox $out/bin/zathura-sandbox \

        --prefix PATH ":" "${lib.makeBinPath [ file ]}" \

        --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura"

    '')

    + ''

      makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \

        --prefix PATH ":" "${lib.makeBinPath [ file ]}" \

        --prefix ZATHURA_PLUGINS_PATH : "$out/lib/zathura"
@@ -46,11 +52,11 @@ symlinkJoin { 
      # so we need to fix the path to reference $out instead.

      rm "$out/${fishCompletion}"

      substitute "${zathura_core.out}/${fishCompletion}" "$out/${fishCompletion}" \

        --replace "${zathura_core.out}" "$out"

        --replace-fail "${zathura_core.out}" "$out"

    '';



  meta = with lib; {

    homepage = "https://pwmt.org/projects/zathura/";

  meta = {

    homepage = "https://pwmt.org/projects/zathura";

    description = "Highly customizable and functional PDF viewer";

    longDescription = ''

      Zathura is a highly customizable and functional PDF viewer based on the
@@ -58,9 +64,9 @@ symlinkJoin { 
      is an application that provides a minimalistic and space saving interface

      as well as an easy usage that mainly focuses on keyboard interaction.

    '';

    license = licenses.zlib;

    platforms = platforms.unix;

    maintainers = with maintainers; [

    license = lib.licenses.zlib;

    platforms = lib.platforms.unix;

    maintainers = with lib.maintainers; [

      smironov

      globin

      TethysSvensson