diff options
Diffstat (limited to 'pkgs/development/interpreters/guile/3.0.nix')
-rw-r--r-- | pkgs/development/interpreters/guile/3.0.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 0708fb3d297..a09afadf527 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -10,6 +10,7 @@ , libffi , libtool , libunistring +, libxcrypt , makeWrapper , pkg-config , pkgsBuildBuild @@ -48,6 +49,8 @@ builder rec { libtool libunistring readline + ] ++ lib.optionals stdenv.isLinux [ + libxcrypt ]; propagatedBuildInputs = [ boehmgc @@ -59,6 +62,8 @@ builder rec { # flags, see below. libtool libunistring + ] ++ lib.optionals stdenv.isLinux [ + libxcrypt ]; # According to @@ -98,9 +103,6 @@ builder rec { # See below. "--without-threads" ] - # Disable JIT on Apple Silicon, as it is not yet supported - # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44505"; - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "--enable-jit=no" # At least on x86_64-darwin '-flto' autodetection is not correct: # https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028 ++ lib.optional (stdenv.isDarwin) "--disable-lto"; @@ -114,8 +116,9 @@ builder rec { + '' sed -i "$out/lib/pkgconfig/guile"-*.pc \ -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ; - s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ; s|-lltdl|-L${libtool.lib}/lib -lltdl|g ; + s|-lcrypt|-L${libxcrypt}/lib -lcrypt|g ; + s|^Cflags:\(.*\)$|Cflags: -I${libunistring.dev}/include \1|g ; s|includedir=$out|includedir=$dev|g " ''; @@ -125,6 +128,9 @@ builder rec { doCheck = false; doInstallCheck = doCheck; + # In procedure bytevector-u8-ref: Argument 2 out of range + dontStrip = stdenv.isDarwin; + setupHook = ./setup-hook-3.0.sh; passthru = rec { |