pyrox.dev / nixpkgs
lol
fork atom

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

guile-*: fix build on darwin

authored by Weijia Wang and committed by GitHub 68517cc8 9ec83042

+19 -1
unified split
+3
pkgs/by-name/gu/guile-lzma/package.nix
··· 27 28 doCheck = true; 29 30 meta = with lib; { 31 homepage = "https://ngyro.com/software/guile-lzma.html"; 32 description = "Guile wrapper for lzma library";
··· 27 28 doCheck = true; 29 30 + # In procedure bytevector-u8-ref: Argument 2 out of range 31 + dontStrip = stdenv.isDarwin; 32 + 33 meta = with lib; { 34 homepage = "https://ngyro.com/software/guile-lzma.html"; 35 description = "Guile wrapper for lzma library";
+3
pkgs/development/guile-modules/guile-gcrypt/default.nix
··· 33 makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; 34 doCheck = true; 35 36 meta = with lib; { 37 description = "Bindings to Libgcrypt for GNU Guile"; 38 homepage = "https://notabug.org/cwebber/guile-gcrypt";
··· 33 makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; 34 doCheck = true; 35 36 + # In procedure bytevector-u8-ref: Argument 2 out of range 37 + dontStrip = stdenv.isDarwin; 38 + 39 meta = with lib; { 40 description = "Bindings to Libgcrypt for GNU Guile"; 41 homepage = "https://notabug.org/cwebber/guile-gcrypt";
+4
pkgs/development/guile-modules/guile-ncurses/default.nix
··· 29 "--with-gnu-filesystem-hierarchy" 30 ]; 31 32 postFixup = '' 33 for f in $out/${guile.siteDir}/ncurses/**.scm; do \ 34 substituteInPlace $f \
··· 29 "--with-gnu-filesystem-hierarchy" 30 ]; 31 32 + env = lib.optionalAttrs stdenv.cc.isClang { 33 + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; 34 + }; 35 + 36 postFixup = '' 37 for f in $out/${guile.siteDir}/ncurses/**.scm; do \ 38 substituteInPlace $f \
+4
pkgs/development/libraries/libfive/default.nix
··· 61 "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" 62 ]; 63 64 postInstall = lib.optionalString stdenv.isDarwin '' 65 # No rules to install the mac app, so do it manually. 66 mkdir -p $out/Applications
··· 61 "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15" 62 ]; 63 64 + env = lib.optionalAttrs stdenv.cc.isClang { 65 + NIX_CFLAGS_COMPILE = "-Wno-error=enum-constexpr-conversion"; 66 + }; 67 + 68 postInstall = lib.optionalString stdenv.isDarwin '' 69 # No rules to install the mac app, so do it manually. 70 mkdir -p $out/Applications
+3
pkgs/development/scheme-modules/scheme-bytestructures/default.nix
··· 28 doCheck = true; 29 makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; 30 31 meta = with lib; { 32 description = "Structured access to bytevector contents"; 33 homepage = "https://github.com/TaylanUB/scheme-bytestructures";
··· 28 doCheck = true; 29 makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; 30 31 + # In procedure bytevector-u8-ref: Argument 2 out of range 32 + dontStrip = stdenv.isDarwin; 33 + 34 meta = with lib; { 35 description = "Structured access to bytevector contents"; 36 homepage = "https://github.com/TaylanUB/scheme-bytestructures";
+2 -1
pkgs/servers/dico/default.nix
··· 19 20 strictDeps = true; 21 22 - doCheck = true; 23 24 meta = with lib; { 25 description = "Flexible dictionary server and client implementing RFC 2229";
··· 19 20 strictDeps = true; 21 22 + # ERROR: All 188 tests were run, 90 failed unexpectedly. 23 + doCheck = !stdenv.isDarwin; 24 25 meta = with lib; { 26 description = "Flexible dictionary server and client implementing RFC 2229";