Merge #21337: guix: Update darwin native packages dependencies

laanwj · laanwj · commit b4d22654fe9e · 2021-03-04T16:01:25.000+01:00
c967fb7 guix: Remove libcap from manifest (Hennadii Stepanov) 7bbb409 guix: Update darwin native packages dependencies (Hennadii Stepanov) Pull request description: It is a #20470 follow up. ACKs for top commit: fanquake: ACK c967fb7 Tree-SHA512: 66ce05770f578ba61a44c58747c5a2669f425a989ed987838058bd86e3b49e342ac5a4f8852fc49f2b3a86b58fb6a340fdf3e34c1fc19bdab910729febba4bc7
diff --git 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
@@ -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 '())))))
