Merge pull request #272153 from wegank/guile-fixes-1
guile-*: fix build on darwin
This commit is contained in:
commit
68517cc894
6 changed files with 19 additions and 1 deletions
|
@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
# In procedure bytevector-u8-ref: Argument 2 out of range
|
||||
dontStrip = stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://ngyro.com/software/guile-lzma.html";
|
||||
description = "Guile wrapper for lzma library";
|
||||
|
|
|
@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
|
|||
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
|
||||
doCheck = true;
|
||||
|
||||
# In procedure bytevector-u8-ref: Argument 2 out of range
|
||||
dontStrip = stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bindings to Libgcrypt for GNU Guile";
|
||||
homepage = "https://notabug.org/cwebber/guile-gcrypt";
|
||||
|
|
|
@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
|
|||
"--with-gnu-filesystem-hierarchy"
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
for f in $out/${guile.siteDir}/ncurses/**.scm; do \
|
||||
substituteInPlace $f \
|
||||
|
|
|
@ -61,6 +61,10 @@ stdenv.mkDerivation {
|
|||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"
|
||||
];
|
||||
|
||||
env = lib.optionalAttrs stdenv.cc.isClang {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=enum-constexpr-conversion";
|
||||
};
|
||||
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
# No rules to install the mac app, so do it manually.
|
||||
mkdir -p $out/Applications
|
||||
|
|
|
@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
|
|||
doCheck = true;
|
||||
makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
|
||||
|
||||
# In procedure bytevector-u8-ref: Argument 2 out of range
|
||||
dontStrip = stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Structured access to bytevector contents";
|
||||
homepage = "https://github.com/TaylanUB/scheme-bytestructures";
|
||||
|
|
|
@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
strictDeps = true;
|
||||
|
||||
doCheck = true;
|
||||
# ERROR: All 188 tests were run, 90 failed unexpectedly.
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Flexible dictionary server and client implementing RFC 2229";
|
||||
|
|
Loading…
Reference in a new issue