From dae3dca29075d5de8c4c51b3eab9bf0334866c9a Mon Sep 17 00:00:00 2001 From: Chris Wells Date: Tue, 14 Jan 2025 11:48:09 -0600 Subject: Adding new modules --- nix/overlay.nix | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) (limited to 'nix/overlay.nix') diff --git a/nix/overlay.nix b/nix/overlay.nix index 82c1d72..8c6baf4 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -14,11 +14,46 @@ in { www-main = hfinal.callCabal2nix "www-main" src {}; }); - site = prev.symlinkJoin { - name = "site"; + rubberWith = pkgs: prev.symlinkJoin { + name = "rubber"; + nativeBuildInputs = [ + prev.makeWrapper + ]; + paths = [ + prev.rubber + ]; + postBuild = '' + for x in $out/bin/*; do + wrapProgram "$x" --prefix PATH : ${prev.lib.makeBinPath pkgs} + done + ''; + }; + + hakyllWith = hakyll: pkgs: prev.symlinkJoin { + inherit (hakyll) name; + nativeBuildInputs = [ + prev.makeWrapper + ]; paths = [ - (final.haskell.lib.compose.justStaticExecutables final.haskellPackages.www-main) - prev.rsync + (final.haskell.lib.compose.justStaticExecutables hakyll) ]; + postBuild = '' + for x in $out/bin/*; do + wrapProgram "$x" --prefix PATH : ${prev.lib.makeBinPath pkgs} + done + ''; }; + + www-main = final.hakyllWith final.haskellPackages.www-main [ + (final.rubberWith [ prev.texlive.combined.scheme-full ]) + prev.rsync + ]; + + # site = prev.symlinkJoin { + # name = "site"; + # paths = [ + # (final.haskell.lib.compose.justStaticExecutables final.haskellPackages.www-main) + # prev.rsync + # ]; + # }; } -- cgit v1.2.3