From ae25075180c79ddd0da093626af1879051359a4c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 5 Dec 2023 00:47:11 +0100 Subject: [PATCH 1/6] guile-gcrypt: don't strip on darwin --- pkgs/development/guile-modules/guile-gcrypt/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/guile-modules/guile-gcrypt/default.nix b/pkgs/development/guile-modules/guile-gcrypt/default.nix index ac5d373955f5..ff31b009da31 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"; From 1543cd24cc75c0cededadd7922ed52b7f71422f7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 5 Dec 2023 00:47:20 +0100 Subject: [PATCH 2/6] guile-lzma: don't strip on darwin --- pkgs/by-name/gu/guile-lzma/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/gu/guile-lzma/package.nix b/pkgs/by-name/gu/guile-lzma/package.nix index 66dddeb88ff7..89a361ef9e4c 100644 --- a/pkgs/by-name/gu/guile-lzma/package.nix +++ b/pkgs/by-name/gu/guile-lzma/package.nix @@ -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"; From 12bcee759da4967ea9a6db6bf16d6095495a35f3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 5 Dec 2023 00:47:27 +0100 Subject: [PATCH 3/6] scheme-bytestructures: don't strip on darwin --- .../scheme-modules/scheme-bytestructures/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 25412b45b40b..cfdb39e58616 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"; From 8e9dcabab736d89d2ba808fa294029b38c6bef08 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 5 Dec 2023 00:47:45 +0100 Subject: [PATCH 4/6] guile-ncurses: fix build on darwin --- pkgs/development/guile-modules/guile-ncurses/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 7c092db5a7eb..a355ed44777a 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 \ From 096b7523938b0dc47225c58f2e530078458f29be Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 5 Dec 2023 00:48:02 +0100 Subject: [PATCH 5/6] libfive: fix build on darwin --- pkgs/development/libraries/libfive/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index f5fbf21f94fd..95fcf7131103 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 From 33b1ba774c5ae965cab5aad52874c4f22996e386 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 5 Dec 2023 00:48:31 +0100 Subject: [PATCH 6/6] dico: disable tests on darwin --- pkgs/servers/dico/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index e372ffe9bad8..658d477a483d 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -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";