Merge pull request #269500 from Samasaur1/master

figlet: link to unistd on all platforms; restore warnings
This commit is contained in:
Emily Trau 2023-11-29 16:56:36 +11:00 committed by GitHub
commit 2fd1bcfbe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -21,12 +21,13 @@ stdenv.mkDerivation rec {
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=";
})
];
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
};
makeFlags = [ "prefix=$(out)" "CC:=$(CC)" "LD:=$(CC)" ];
postInstall = "cp -ar ${contributed}/* $out/share/figlet/";