From cc6cbfde3ad82f115f2910d7fc5317d0375e733f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 13 May 2018 10:53:09 -0400 Subject: [PATCH] haskell-generic-builder: Add extra framework dirs Just like with the other `--extra-*` flags, cc/ld-wrapper already handles this, but we need to make Cabal aware so that the haskell builds have the correct metadata. --- pkgs/development/haskell-modules/generic-builder.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 01e2eef58cba2..2ae00b05fa3c0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -242,6 +242,9 @@ stdenv.mkDerivation ({ if [ -d "$p/lib" ]; then configureFlags+=" --extra-lib-dirs=$p/lib" fi + if [[ -d "$p/Library/Frameworks" ]]; then + configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks" + fi done '' + (optionalString stdenv.isDarwin '' # Work around a limit in the macOS Sierra linker on the number of paths