punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(figlet): Overlay -> custom package

Browse source 
Still can't get the overlay to work :(
This commit is contained in:
punkfairie 2024-11-17 16:17:57 -08:00
parent 73303410e9
commit 9d38846b58
Signed by: punkfairie
GPG key ID: A509E8F77FB9D696
3 changed files with 57 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/home/programs/figlet/default.nix
View file

@ -14,7 +14,7 @@ in
config = mkIf cfg.enable {
home.packages = with pkgs; [
figlet
marleyos.figlet-xero-fonts
];
programs.fish.functions = lib.mkIf config.programs.fish.enable {

11
overlays/figlet/default.nix
View file

@ -1,11 +0,0 @@
_:
final: prev: {
figlet = prev.figlet.overrideAttrs (old: {
contributed = prev.fetchFromGitHub {
owner = "xero";
repo = "figlet-fonts";
rev = "a6d2db1a3ee88bec3518214e851825fc4495ac84";
hash = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY";
};
});
}

56
packages/figlet-xero-fonts/default.nix Normal file
View file

@ -0,0 +1,56 @@
{
lib,
stdenv,
fetchurl,
fetchpatch,
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
pname = "figlet-xero-fonts";
version = "2.2.5";
# some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/
src = fetchurl {
url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz";
sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z";
};
contributed = fetchFromGitHub {
owner = "xero";
repo = "figlet-fonts";
rev = "a6d2db1a3ee88bec3518214e851825fc4495ac84";
hash = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY";
};
patches = [
(fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399";
name = "musl-fix-cplusplus-decls.patch";
sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j";
})
(fetchpatch {
url = "https://github.com/cmatsuoka/figlet/commit/9a50c1795bc32e5a698b855131ee87c8d7762c9e.patch";
name = "unistd-on-darwin.patch";
sha256 = "hyfY87N+yuAwjsBIjpgvcdJ1IbzlR4A2yUJQSzShCRI=";
})
];
makeFlags = [
"prefix=$(out)"
"CC:=$(CC)"
"LD:=$(CC)"
];
postInstall = "cp -ar ${contributed}/* $out/share/figlet/";
doCheck = true;
meta = {
description = "Program for making large letters out of ordinary text (with fonts from xero added)";
homepage = "http://www.figlet.org/";
license = lib.licenses.afl21;
maintainers = with lib.maintainers; [ ehmry ];
platforms = lib.platforms.unix;
};
}