Skip to content

Commit

Permalink
Fixes for nix-tools builds
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack committed Mar 29, 2024
1 parent 2012142 commit a523c85
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
18 changes: 9 additions & 9 deletions nix-tools/flake.lock

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

3 changes: 1 addition & 2 deletions overlays/haskell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1119,8 +1119,7 @@ final: prev: {
ghc-extra-projects-nix = final.ghc-extra-projects.${compiler-nix-name}.plan-nix;
}) // final.lib.optionalAttrs (ifdLevel > 1) {
# Things that require two levels of IFD to build (inputs should be in level 1)
nix-tools = final.buildPackages.haskell-nix.nix-tools;
nix-tools-unchecked = final.buildPackages.haskell-nix.nix-tools-unchecked;
nix-tools-unchecked = final.pkgsBuildBuildhaskell-nix.nix-tools-unchecked;
} // final.lib.optionalAttrs (ifdLevel > 1
&& final.haskell-nix.haskellLib.isCrossHost
# GHCJS builds its own template haskell runner.
Expand Down

0 comments on commit a523c85

Please sign in to comment.