From 85f2c0ba760377e68673d9efb336ac762e04683c Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 9 Nov 2021 12:00:24 -0500 Subject: gitlab-ci/darwin: Move SDK path discovery into toolchain.nix Reduce a bit of duplication and a manual step when running builds manually. --- .gitlab/darwin/toolchain.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitlab/darwin') diff --git a/.gitlab/darwin/toolchain.nix b/.gitlab/darwin/toolchain.nix index 1042b76c18..fe221b3c43 100644 --- a/.gitlab/darwin/toolchain.nix +++ b/.gitlab/darwin/toolchain.nix @@ -98,5 +98,8 @@ pkgs.writeTextFile { export SPHINXBUILD="${pkgs.python3Packages.sphinx}/bin/sphinx-build" export CABAL_INSTALL="${pkgs.cabal-install}/bin/cabal" export CABAL="$CABAL_INSTALL" + + sdk_path="$(xcrun --sdk macosx --show-sdk-path)" + export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-ffi-libraries=$sdk_path/usr/lib --with-ffi-includes=$sdk_path/usr/include/ffi" ''; } -- cgit v1.2.1