From 6f025b12a29b5649e2cb59250d88a7e53505ecec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?VESSE=20L=C3=A9o?= Date: Mon, 17 Mar 2025 21:42:28 +0100 Subject: [PATCH 1/2] fancy-cat: init at 0.4.0 fix: license name tag --- pkgs/by-name/fa/fancy-cat/0001-changes.patch | 22 +++++++ pkgs/by-name/fa/fancy-cat/build.zig.zon.nix | 44 ++++++++++++++ pkgs/by-name/fa/fancy-cat/package.nix | 60 ++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 pkgs/by-name/fa/fancy-cat/0001-changes.patch create mode 100644 pkgs/by-name/fa/fancy-cat/build.zig.zon.nix create mode 100644 pkgs/by-name/fa/fancy-cat/package.nix diff --git a/pkgs/by-name/fa/fancy-cat/0001-changes.patch b/pkgs/by-name/fa/fancy-cat/0001-changes.patch new file mode 100644 index 000000000000..87bfc8e149d7 --- /dev/null +++ b/pkgs/by-name/fa/fancy-cat/0001-changes.patch @@ -0,0 +1,22 @@ +diff --git a/build.zig b/build.zig +index 5a16b8a..3c36c20 100755 +--- a/build.zig ++++ b/build.zig +@@ -5,7 +5,7 @@ fn addMupdfStatic(exe: *std.Build.Step.Compile, b: *std.Build, prefix: []const u + exe.addLibraryPath(.{ .cwd_relative = b.fmt("{s}/lib", .{prefix}) }); + + exe.addObjectFile(.{ .cwd_relative = b.fmt("{s}/lib/libmupdf.a", .{prefix}) }); +- exe.addObjectFile(.{ .cwd_relative = b.fmt("{s}/lib/libmupdf-third.a", .{prefix}) }); ++ exe.addObjectFile(.{ .cwd_relative = b.fmt("{s}/lib/libmupdf.a", .{prefix}) }); + + exe.linkLibC(); + } +@@ -22,7 +22,7 @@ fn addMupdfDynamic(exe: *std.Build.Step.Compile, target: std.Target) void { + exe.addLibraryPath(.{ .cwd_relative = "/home/linuxbrew/.linuxbrew/lib" }); + + const linux_libs = [_][]const u8{ +- "mupdf-third", "harfbuzz", ++ "mupdf", "harfbuzz", + "freetype", "jbig2dec", + "jpeg", "openjp2", + "gumbo", "mujs", diff --git a/pkgs/by-name/fa/fancy-cat/build.zig.zon.nix b/pkgs/by-name/fa/fancy-cat/build.zig.zon.nix new file mode 100644 index 000000000000..0a1c36bb8b96 --- /dev/null +++ b/pkgs/by-name/fa/fancy-cat/build.zig.zon.nix @@ -0,0 +1,44 @@ +# generated by zon2nix (https://github.com/nix-community/zon2nix) + +{ + linkFarm, + fetchzip, +}: + +linkFarm "zig-packages" [ + { + name = "fastb64z-1.0.0-AAAAAPufAAC1oOmqjUybDgnEHsOlgJKIjnUWwFy3i3TJ"; + path = fetchzip { + url = "https://github.com/freref/fastb64z/archive/fa3f34a4528609a8778124641b080e90d93c357a.tar.gz"; + hash = "sha256-yz1XRRsX0Uh7lmPBKSkzDJIxValM5VvbI5avpa530nE="; + }; + } + { + name = "fzwatch-0.1.0-AAAAAFwxAACmGB7IN0835JkUIEuY_0zDJr_KGkZZQ2SI"; + path = fetchzip { + url = "https://github.com/freref/fzwatch/archive/6d5b49ed5a8ee3ed08f0e80b8f340cc3c8c8ac6e.tar.gz"; + hash = "sha256-rBbCdwTaq0DVBiUMzq2q72jgtaTIdjqivMI8dq+BaPM="; + }; + } + { + name = "vaxis-0.1.0-BWNV_K3yCACrTy3A5cbZElLyICx5a2O2EzPxmgVRcbKJ"; + path = fetchzip { + url = "https://github.com/freref/libvaxis/archive/6a37605dde55898dcca4769dd3eb1e333959c209.tar.gz"; + hash = "sha256-5DW2V2bVsHtSw7UMGvJ+P0FpXIf5kTNjrq2SMqU6FIk="; + }; + } + { + name = "zg-0.13.4-AAAAAGiZ7QLz4pvECFa_wG4O4TP4FLABHHbemH2KakWM"; + path = fetchzip { + url = "https://codeberg.org/atman/zg/archive/4a002763419a34d61dcbb1f415821b83b9bf8ddc.tar.gz"; + hash = "sha256-fo3l6cjkrr/godElTGnQzalBsasN7J73IDIRmw7v1gA="; + }; + } + { + name = "zigimg-0.1.0-lly-O-NTEABwkjg9_WM4uLQr_TtL-7jp375PsZJyugGN"; + path = fetchzip { + url = "https://github.com/TUSF/zigimg/archive/5102e09be233d372e9e05f4cb2ffbefba30bc1c0.tar.gz"; + hash = "sha256-0HYK5A8Jlx1WD1hdU07r+m2AXl6UuazFiZd7P3uh/wY="; + }; + } +] diff --git a/pkgs/by-name/fa/fancy-cat/package.nix b/pkgs/by-name/fa/fancy-cat/package.nix new file mode 100644 index 000000000000..8757b21d0e9b --- /dev/null +++ b/pkgs/by-name/fa/fancy-cat/package.nix @@ -0,0 +1,60 @@ +{ + callPackage, + fetchFromGitHub, + freetype, + gumbo, + harfbuzz, + jbig2dec, + lib, + libjpeg, + libz, + mujs, + mupdf, + openjpeg, + stdenv, + zig, +}: +stdenv.mkDerivation rec { + pname = "fancy-cat"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "freref"; + repo = "fancy-cat"; + tag = "v${version}"; + hash = "sha256-ziHtPfK9GOxKF800kk+kh12Fwh91xbjDYx9wv2pLZWI="; + }; + + patches = [ ./0001-changes.patch ]; + + nativeBuildInputs = [ + zig.hook + ]; + + zigBuildFlags = [ "--release=fast" ]; + + buildInputs = [ + mupdf + harfbuzz + freetype + jbig2dec + libjpeg + openjpeg + gumbo + mujs + libz + ]; + + postPatch = '' + ln -s ${callPackage ./build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p + ''; + + meta = { + description = "PDF viewer for terminals using the Kitty image protocol"; + homepage = "https://github.com/freref/fancy-cat"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ ciflire ]; + mainProgram = "fancy-cat"; + inherit (zig.meta) platforms; + }; +} From b8bb358026f60f5175c6d48c5189dd25517518f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?VESSE=20L=C3=A9o?= Date: Mon, 5 May 2025 08:18:44 +0200 Subject: [PATCH 2/2] Update pkgs/by-name/fa/fancy-cat/package.nix Co-authored-by: Arthur <150680976+arthsmn@users.noreply.github.com> --- pkgs/by-name/fa/fancy-cat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fancy-cat/package.nix b/pkgs/by-name/fa/fancy-cat/package.nix index 8757b21d0e9b..fe02dca67c4e 100644 --- a/pkgs/by-name/fa/fancy-cat/package.nix +++ b/pkgs/by-name/fa/fancy-cat/package.nix @@ -14,14 +14,14 @@ stdenv, zig, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fancy-cat"; version = "0.4.0"; src = fetchFromGitHub { owner = "freref"; repo = "fancy-cat"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ziHtPfK9GOxKF800kk+kh12Fwh91xbjDYx9wv2pLZWI="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { mainProgram = "fancy-cat"; inherit (zig.meta) platforms; }; -} +})