From acee865bcf0131c10ed475b435af802ffe8dceee Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 4 Aug 2023 09:44:35 -0400 Subject: Set BIZ_ROOT in nix builder --- Biz/Bild.hs | 4 ++-- Biz/Bild/Builder.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Biz/Bild.hs b/Biz/Bild.hs index 58a1b9c..cf471fe 100644 --- a/Biz/Bild.hs +++ b/Biz/Bild.hs @@ -467,13 +467,13 @@ analyze hmap ns = case Map.lookup ns hmap of packageSet = "ghcWith", compilerFlags = [ "-Werror", - "-i$src", + "-i$BIZ_ROOT", "-odir", ".", "-hidir", ".", "--make", - "$src" path + "$BIZ_ROOT" path ] ++ case out of Meta.Bin o -> diff --git a/Biz/Bild/Builder.nix b/Biz/Bild/Builder.nix index 9516ca1..04002d0 100644 --- a/Biz/Bild/Builder.nix +++ b/Biz/Bild/Builder.nix @@ -22,10 +22,11 @@ let private.selectAttrs (lib.strings.splitString " " langDeps) pkgset else []; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { inherit name buildPhase; - buildInputs = [ (private.${packageSet} deps) ]; src = lib.sources.cleanSourceWith {inherit filter; src = lib.sources.cleanSource root;}; + BIZ_ROOT = src; + buildInputs = [ (private.${packageSet} deps) ]; installPhase = '' mkdir -p $out/bin && cp ${name} $out/bin ''; -- cgit v1.2.3