From 3bebfec4681fa854ea41b65b3f9951cd7908f423 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@well-typed.com>
Date: Fri, 13 Nov 2020 09:42:29 -0500
Subject: [PATCH] nix: Package build-cabal
---
build-cabal.sh | 5 ++++-
default.nix | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/build-cabal.sh b/build-cabal.sh
index e0b0764..47c42f1 100755
--- a/build-cabal.sh
+++ b/build-cabal.sh
@@ -3,5 +3,8 @@
set -e
out=_cabal_out
dir=libraries/Cabal/Cabal
-time _build/stage1/bin/ghc -O -hidir $out -odir $out -i$dir $dir/Setup.hs +RTS -s -RTS $@
+if [[ -z "$GHC" ]]; then
+ GHC="_build/stage1/bin/ghc"
+fi
+time $GHC -O -hidir $out -odir $out -i$dir $dir/Setup.hs +RTS -s -RTS $@
rm -R $out
diff --git a/default.nix b/default.nix
index 64580a0..650e5a3 100644
--- a/default.nix
+++ b/default.nix
@@ -30,6 +30,7 @@ let
--prefix PATH : ${haskellPackages.fast-tags}/bin
makeWrapper ${./diff-submodules.py} $out/bin/diff-submodules \
--prefix PATH : ${python3}/bin
+ makeWrapper ${./build-cabal.sh} $out/bin/build-cabal
makeWrapper ${./rts_stats.py} $out/bin/rts-stats
makeWrapper ${./ghc_perf.py} $out/bin/ghc-perf
--
GitLab