From d4b3932c4433cb59d4b825d71622bb37fb988281 Mon Sep 17 00:00:00 2001 From: Malte Voos Date: Wed, 4 May 2022 23:49:16 +0200 Subject: [PATCH] bdfresize: init at 1.5 --- pkgs/tools/misc/bdfresize/default.nix | 20 +++++++++++++++++++ .../bdfresize/remove-malloc-declaration.patch | 11 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/bdfresize/default.nix create mode 100644 pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch diff --git a/pkgs/tools/misc/bdfresize/default.nix b/pkgs/tools/misc/bdfresize/default.nix new file mode 100644 index 00000000000..f1ac559fb67 --- /dev/null +++ b/pkgs/tools/misc/bdfresize/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "bdfresize"; + version = "1.5"; + + src = fetchurl { + url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/${pname}-${version}.tar.gz"; + hash = "sha256-RAz8BiCgI35GNSwUoHdMqj8wWXWbCiDe/vyU6EkIl6Y="; + }; + + patches = [ ./remove-malloc-declaration.patch ]; + + meta = with lib; { + description = "Tool to resize BDF fonts"; + homepage = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ malvo ]; + }; +} diff --git a/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch b/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch new file mode 100644 index 00000000000..c58888a4be2 --- /dev/null +++ b/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch @@ -0,0 +1,11 @@ +Remove an unneeded declaration of malloc so gcc doesn't complain. +--- a/charresize.c ++++ b/charresize.c +@@ -46,7 +46,6 @@ static int bit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; + void + processChar(void) + { +- char *malloc(); + char *srcimage; + int *dstgray; + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d30f0a6e41..0dabc262269 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2615,6 +2615,8 @@ with pkgs; bdf2sfd = callPackage ../tools/misc/bdf2sfd { }; + bdfresize = callPackage ../tools/misc/bdfresize { }; + bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; bchunk = callPackage ../tools/cd-dvd/bchunk { };