Skip to content

Some adjustments for the ghc build shell #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 27, 2025
Merged

Some adjustments for the ghc build shell #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02bbcc6
Add libffi
angerman Feb 25, 2025
3a5fb71
Update cabal ref
angerman Feb 25, 2025
a00e5d2
Add extra quotes.
angerman Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dynamic.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 ]
)
;

Expand Down
48 changes: 24 additions & 24 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, ... }:
Expand Down
Loading