From 96852235abc9fbb6d8f72f94f84ab7dd558b41c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Sat, 16 Nov 2024 16:37:31 +0100 Subject: [PATCH] Yeah sort of --- flake.nix | 15 +-------------- rhine-tree/nix/default.nix | 19 +++++++++++++++++++ rhine-tree/static/index.html | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 rhine-tree/nix/default.nix diff --git a/flake.nix b/flake.nix index 1f84d532..d946cdf0 100644 --- a/flake.nix +++ b/flake.nix @@ -155,20 +155,7 @@ # Helper to build a flake output for all systems that are defined in nixpkgs forAllPlatforms = f: mapAttrs (system: pkgs: f system (pkgs.extend overlay)) inputs.nixpkgs.legacyPackages; - rhine-tree-js = pkgs: let - dommy = (pkgs.pkgsCross.ghcjs.extend overlay).haskell.packages.ghc910.rhine-tree; - in pkgs.writeTextFile { - name = "index.html"; - text = '' - - - - - - - ''; - }; + rhine-tree-js = pkgs: import ./rhine-tree/nix { inherit pkgs overlay lib; }; in { # Reexport the overlay so other downstream flakes can use it to develop rhine projects with low effort. diff --git a/rhine-tree/nix/default.nix b/rhine-tree/nix/default.nix new file mode 100644 index 00000000..0ef9d99b --- /dev/null +++ b/rhine-tree/nix/default.nix @@ -0,0 +1,19 @@ +{pkgs, overlay, lib}: +let + dommyPkg = (pkgs.pkgsCross.ghcjs.extend overlay).haskell.packages.ghc910.rhine-tree; + dommy = lib.traceVal (dommyPkg + "/bin/dommy"); + dommyContents = lib.traceVal (builtins.readFile dommy); + botchedHTML = pkgs.writeTextFile { + name = "index.html"; + text = '' + + + + + + + ''; + }; +in dommyPkg diff --git a/rhine-tree/static/index.html b/rhine-tree/static/index.html index 76964533..0e1e320b 100644 --- a/rhine-tree/static/index.html +++ b/rhine-tree/static/index.html @@ -1,7 +1,7 @@ -