diff options
| -rw-r--r-- | contrib/guix/libexec/build.sh | 15 | ||||
| -rw-r--r-- | contrib/guix/manifest.scm | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index b92d3f917d..051066a6a0 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -58,17 +58,10 @@ unset C_INCLUDE_PATH unset CPLUS_INCLUDE_PATH case "$HOST" in *darwin*) - # When targeting darwin, some native tools built by depends require - # native packages not incorporated in depends - # - # libcap required by native_cdrkit/wodim - # zlib, bzip2 required by native_cdrkit/genisoimage - for native_pkg in libcap zlib bzip2; do - native_pkg_store_path=$(store_path "$native_pkg") - export LIBRARY_PATH="${native_pkg_store_path}/lib:${LIBRARY_PATH}" - export CPATH="${native_pkg_store_path}/include:${CPATH}" - done - ;; + # When targeting darwin, zlib is required by native_libdmg-hfsplus. + zlib_store_path=$(store_path "zlib") + export LIBRARY_PATH="${zlib_store_path}/lib:${LIBRARY_PATH}" + export CPATH="${zlib_store_path}/include:${CPATH}" esac # Set environment variables to point the CROSS toolchain to the right diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index e0e2e1e16e..bd9f895dce 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -235,5 +235,5 @@ chain for " target " development.")) ((string-contains target "-linux-") (list (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") - (list clang-8 libcap binutils imagemagick libtiff librsvg font-tuffy cmake xorriso)) + (list clang-8 binutils imagemagick libtiff librsvg font-tuffy cmake xorriso)) (else '()))))) |