diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-03-04 21:11:38 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-26 21:54:51 -0400 |
| commit | 5428db7c7c24c9f3cf0612edc4a3d1d9366fcace (patch) | |
| tree | 4a62ce60241c5d0c451727c5da2fe75e4001f6ce /pkgs/development/interpreters/guile | |
| parent | 8cabf4d5c56ef23eb79429e087dc702f049e9bfe (diff) | |
| download | nixlib-5428db7c7c24c9f3cf0612edc4a3d1d9366fcace.tar nixlib-5428db7c7c24c9f3cf0612edc4a3d1d9366fcace.tar.gz nixlib-5428db7c7c24c9f3cf0612edc4a3d1d9366fcace.tar.bz2 nixlib-5428db7c7c24c9f3cf0612edc4a3d1d9366fcace.tar.lz nixlib-5428db7c7c24c9f3cf0612edc4a3d1d9366fcace.tar.xz nixlib-5428db7c7c24c9f3cf0612edc4a3d1d9366fcace.tar.zst nixlib-5428db7c7c24c9f3cf0612edc4a3d1d9366fcace.zip | |
guile: apply patch for macOS 10.12+
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 5e458c6e2ccc..fb8e75e8793a 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -2,6 +2,7 @@ , fetchurl, makeWrapper, gawk, pkgconfig , libffi, libtool, readline, gmp, boehmgc, libunistring , coverageAnalysis ? null +, fetchpatch }: # Do either a coverage analysis build or a standard build. @@ -42,8 +43,11 @@ patches = [ ./eai_system.patch ./riscv.patch - ] ++ - (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch); + ] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch + ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch"; + sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207"; + }); # Explicitly link against libgcc_s, to work around the infamous # "libgcc_s.so.1 must be installed for pthread_cancel to work". |