diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-12-07 12:21:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 12:21:28 +0100 |
| commit | 68517cc894784a341dec5cc1034467ca124dc604 (patch) | |
| tree | b2e1f09bcb5eceaf334650af85a25bc286a44679 /pkgs/development | |
| parent | 9ec830423e680c6822f38258cc0c93518de45acf (diff) | |
| parent | 33b1ba774c5ae965cab5aad52874c4f22996e386 (diff) | |
Merge pull request #272153 from wegank/guile-fixes-1
guile-*: fix build on darwin
Diffstat (limited to 'pkgs/development')
4 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index ac5d373955f5e..ff31b009da316 100644 --- a/pkgs/development/guile-modules/guile-gcrypt/default.nix +++ b/pkgs/development/guile-modules/guile-gcrypt/default.nix @@ -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"; diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 7c092db5a7eb7..a355ed44777a2 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -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 \ diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index f5fbf21f94fd7..95fcf7131103e 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -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 diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 25412b45b40b7..cfdb39e586163 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -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"; |