From 4982873579d4fbc3f7c9369d8118ddc8dece9361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sun, 25 Aug 2024 22:35:19 -0400 Subject: [PATCH] zathuraPkgs: modernize --- pkgs/applications/misc/zathura/cb/default.nix | 17 +++++++++-------- pkgs/applications/misc/zathura/core/default.nix | 8 ++++---- pkgs/applications/misc/zathura/djvu/default.nix | 15 ++++++++------- .../misc/zathura/pdf-mupdf/default.nix | 14 +++++++------- .../misc/zathura/pdf-poppler/default.nix | 15 ++++++++------- pkgs/applications/misc/zathura/ps/default.nix | 15 ++++++++------- 6 files changed, 44 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 2c4dc76abb47..c3478627b38b 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -11,12 +11,12 @@ libarchive, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-cb"; version = "0.1.10"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-cb/download/zathura-cb-${finalAttrs.version}.tar.xz"; hash = "sha256-ibDKF6gMuh6p/Rs7cvOnFz8KrToGqMNk2GXEmZwYu8g="; }; @@ -26,22 +26,23 @@ stdenv.mkDerivation rec { pkg-config gettext ]; + buildInputs = [ libarchive zathura_core girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-cb/"; description = "Zathura CB plugin"; longDescription = '' The zathura-cb plugin adds comic book support to zathura. ''; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ jlesquembre ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ jlesquembre ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index b7b7a517310b..756bfbdbc600 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -85,11 +85,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura"; description = "Core component for zathura PDF viewer"; - license = licenses.zlib; - platforms = platforms.unix; - maintainers = with maintainers; [ globin ]; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ globin ]; }; }) diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 00d3563d5b76..c38c3827c183 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -12,12 +12,12 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-djvu"; version = "0.2.9"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-${finalAttrs.version}.tar.xz"; hash = "sha256-lub4pu5TIxBzsvcAMmSHL4RQHmPD2nvwWY0EYoawwgA="; }; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { ninja pkg-config ]; + buildInputs = [ djvulibre gettext @@ -34,17 +35,17 @@ stdenv.mkDerivation rec { girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-djvu/"; description = "Zathura DJVU plugin"; longDescription = '' The zathura-djvu plugin adds DjVu support to zathura by using the djvulibre library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index b3b5d514a84c..54c7a3b549fa 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -20,12 +20,12 @@ gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "0.4.2"; pname = "zathura-pdf-mupdf"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-${finalAttrs.version}.tar.xz"; hash = "sha256-fFC+z9mJX9ccExsV336Ut+zJJa8UdfUz/qVp9YgcnhM="; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { mujs ] ++ lib.optional stdenv.isDarwin gtk-mac-integration; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; postPatch = '' sed -i -e '/^mupdfthird =/d' -e 's/, mupdfthird//g' meson.build @@ -57,15 +57,15 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { url = "https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"; }; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-pdf-mupdf/"; description = "Zathura PDF plugin (mupdf)"; longDescription = '' The zathura-pdf-mupdf plugin adds PDF support to zathura by using the mupdf rendering library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 7119acd03746..9395ab23cc0f 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -10,12 +10,12 @@ poppler, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-pdf-poppler"; version = "0.3.2"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${finalAttrs.version}.tar.xz"; hash = "sha256-cavu1RzR0YjO89vUwWR1jjw3FgR1aWeyOtF2rlNFMBE="; }; @@ -25,22 +25,23 @@ stdenv.mkDerivation rec { pkg-config zathura_core ]; + buildInputs = [ poppler girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-pdf-poppler/"; description = "Zathura PDF plugin (poppler)"; longDescription = '' The zathura-pdf-poppler plugin adds PDF support to zathura by using the poppler rendering library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 54202f919669..026e59c5a1eb 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -11,12 +11,12 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zathura-ps"; version = "0.2.7"; src = fetchurl { - url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; + url = "https://pwmt.org/projects/zathura-ps/download/zathura-ps-${finalAttrs.version}.tar.xz"; hash = "sha256-WJf5IEz1+Xi5QTvnzn/r3oQxV69I41GTjt8H2/kwjkY="; }; @@ -26,23 +26,24 @@ stdenv.mkDerivation rec { pkg-config gettext ]; + buildInputs = [ libspectre zathura_core girara ]; - PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; + env.PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; - meta = with lib; { + meta = { homepage = "https://pwmt.org/projects/zathura-ps/"; description = "Zathura PS plugin"; longDescription = '' The zathura-ps plugin adds PS support to zathura by using the libspectre library. ''; - license = licenses.zlib; - platforms = platforms.unix; + license = lib.licenses.zlib; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +})