Some adjustments for the ghc build shell (#213)

* Add libffi

* Update cabal ref

* Add extra quotes.

Author: angerman

Diff for: dynamic.nix

@@ -84,7 +84,7 @@ pkgs.mkShell {
     export DYLD_LIBRARY_PATH="${lib.getLib openssl}/lib"
     ''
     + lib.optionalString withGHCTooling ''
-    export HADRIAN_CONFIGURE_FLAGS=--with-gmp-includes="${lib.getDev gmp}/include" --with-gmp-libraries="${lib.getLib gmp}/lib"
+    export HADRIAN_CONFIGURE_FLAGS="--with-gmp-includes=\"${lib.getDev gmp}/include\" --with-gmp-libraries=\"${lib.getLib gmp}/lib\""
     echo "HADRIAN_CONFIGURE_FLAGS set to $HADRIAN_CONFIGURE_FLAGS"
     echo "To build GHC, run"
     echo "  ./boot"
@@ -129,7 +129,7 @@ pkgs.mkShell {
         ++ attrValues haskell-tools
       )
       ++ optionals withGHCTooling (
-        with pkgs; [ python3 automake autoconf alex happy git ]
+        with pkgs; [ python3 automake autoconf alex happy git libffi.dev ]
       )
     ;
 

Diff for: flake.lock

@@ -5,7 +5,7 @@
     inputs.nixpkgs.follows = "haskellNix/nixpkgs-2411";
     inputs.flake-utils.url = "github:numtide/flake-utils";
     inputs.iohk-nix.url = "github:input-output-hk/iohk-nix";
-    inputs.cabal.url = "github:hsyl20/cabal?ref=hsyl20/per-file-extra-source-options";
+    inputs.cabal.url = "github:stable-haskell/cabal?ref=wip/make-build";
     inputs.cabal.flake = false;
 
     outputs = { self, nixpkgs, flake-utils, haskellNix, iohk-nix, ... }: