push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
--- a/configure
+++ b/configure
@@ -904,7 +904,7 @@
#line 905 "configure"
#include "confdefs.h"
-main(){return(0);}
+int main(){return(0);}
EOF
if { (eval echo configure:910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes

View File

@@ -0,0 +1,31 @@
{
lib,
stdenv,
fetchzip,
}:
stdenv.mkDerivation rec {
pname = "bdfresize";
version = "1.5";
src = fetchzip {
url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/bdfresize-${version}.tar.gz";
hash = "sha256-C4ZLJIn6vVeVUCpNwMu0vdfQQ3qUz4EVIcPob9NejP0=";
};
patches = [
./fix-configure.patch
./remove-malloc-declaration.patch
];
# Fix compilation of getopt; see getopt package for more details
env.NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__";
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; [ malte-v ];
mainProgram = "bdfresize";
};
}

View File

@@ -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;