Merge pull request #34776 from dtzWill/fix/fidget-cross
figlet: simplify, enable tests, fix for cross and musl
This commit is contained in:
commit
1cfd942f91
1 changed files with 11 additions and 6 deletions
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl }:
|
||||
{ stdenv, fetchurl, fetchpatch }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "figlet-2.2.5";
|
||||
|
@ -9,12 +9,17 @@ stdenv.mkDerivation {
|
|||
sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z";
|
||||
};
|
||||
|
||||
installPhase = "make prefix=$out install";
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399;
|
||||
name = "musl-fix-cplusplus-decls.patch";
|
||||
sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
mkdir -p $out/{man/man6,bin}
|
||||
makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet CC=cc LD=cc"
|
||||
'';
|
||||
makeFlags = [ "prefix=$(out)" "CC:=$(CC)" "LD:=$(CC)" ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Program for making large letters out of ordinary text";
|
||||
|
|
Loading…
Reference in a new issue