about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-12-02 06:01:18 +0000
committerGitHub <noreply@github.com>2023-12-02 06:01:18 +0000
commit5c8fdfb488c68699e49633aae5173adbf4090562 (patch)
tree6e02a36945be87d571eb4d8708dd07db5a61459a /pkgs/development/compilers
parentffa42dfb1dd6fd34a71625e4b390f984c0c14f5a (diff)
parent18f8671334414e17b7404cb0be7651c50c07af78 (diff)
downloadnixlib-5c8fdfb488c68699e49633aae5173adbf4090562.tar
nixlib-5c8fdfb488c68699e49633aae5173adbf4090562.tar.gz
nixlib-5c8fdfb488c68699e49633aae5173adbf4090562.tar.bz2
nixlib-5c8fdfb488c68699e49633aae5173adbf4090562.tar.lz
nixlib-5c8fdfb488c68699e49633aae5173adbf4090562.tar.xz
nixlib-5c8fdfb488c68699e49633aae5173adbf4090562.tar.zst
nixlib-5c8fdfb488c68699e49633aae5173adbf4090562.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/sagittarius-scheme/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix
index 2d6a48631c05..941ac1bcb2c3 100644
--- a/pkgs/development/compilers/sagittarius-scheme/default.nix
+++ b/pkgs/development/compilers/sagittarius-scheme/default.nix
@@ -6,7 +6,7 @@
 , boehmgc
 , openssl
 , zlib
-, odbcSupport ? true
+, odbcSupport ? !stdenv.isDarwin
 , libiodbc
 }:
 
@@ -31,8 +31,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc;
 
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=int-conversion";
+
   meta = with lib; {
-    broken = stdenv.isDarwin;
+    broken = stdenv.isDarwin && stdenv.isAarch64;
     description = "An R6RS/R7RS Scheme system";
     longDescription = ''
       Sagittarius Scheme is a free Scheme implementation supporting