diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2018-02-17 10:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-17 10:01:36 +0000 |
| commit | 1cfd942f915bbe00f82740076c8a77eefa4066d9 (patch) | |
| tree | ec8a939ad3c5314f93c81d1a2dd7456050e369cf | |
| parent | f00a1514f9ccb5e69cef194a3d8186c0f8dd840e (diff) | |
| parent | 9696add026aedc1267fe643ece25b16c34bb4bfc (diff) | |
| download | nixlib-1cfd942f915bbe00f82740076c8a77eefa4066d9.tar nixlib-1cfd942f915bbe00f82740076c8a77eefa4066d9.tar.gz nixlib-1cfd942f915bbe00f82740076c8a77eefa4066d9.tar.bz2 nixlib-1cfd942f915bbe00f82740076c8a77eefa4066d9.tar.lz nixlib-1cfd942f915bbe00f82740076c8a77eefa4066d9.tar.xz nixlib-1cfd942f915bbe00f82740076c8a77eefa4066d9.tar.zst nixlib-1cfd942f915bbe00f82740076c8a77eefa4066d9.zip | |
Merge pull request #34776 from dtzWill/fix/fidget-cross
figlet: simplify, enable tests, fix for cross and musl
| -rw-r--r-- | pkgs/tools/misc/figlet/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index f68ae1ec2455..86434847b4a2 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -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"; |