colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #272153 from wegank/guile-fixes-1

Browse Source 
guile-*: fix build on darwin
This commit is contained in:
Weijia Wang 2023-12-07 12:21:28 +01:00 committed by GitHub
commit 68517cc894
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/by-name/gu/guile-lzma/package.nix
View File

@ -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";

3
pkgs/development/guile-modules/guile-gcrypt/default.nix
View File

@ -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";

4
pkgs/development/guile-modules/guile-ncurses/default.nix
View File

@ -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 \

4
pkgs/development/libraries/libfive/default.nix
View File

@ -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

3
pkgs/development/scheme-modules/scheme-bytestructures/default.nix
View File

@ -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";

3
pkgs/servers/dico/default.nix
View File

@ -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";