From 585df9fd3c814b1fbfbb415986f818a220b320cb Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 10 Jul 2026 22:31:02 -0400 Subject: [PATCH] Do not rely on the organic overlay being applied inside the organic_ast_explorer overlay. --- flake.nix | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/flake.nix b/flake.nix index 3858752..37abaf0 100644 --- a/flake.nix +++ b/flake.nix @@ -61,25 +61,31 @@ } ); overlays.default = final: prev: { - organic_ast_explorer = final.lib.makeScope final.newScope (organic_ast_explorer_scope: { - release = final.buildNpmPackage { - pname = "organic_ast_explorer"; - version = "0.0.0"; + organic_ast_explorer = final.lib.makeScope final.newScope ( + organic_ast_explorer_scope: + let + wasm_bundler = (organic.overlays.default final final).organic.wasm_bundler; + in + { + release = final.buildNpmPackage { + pname = "organic_ast_explorer"; + version = "0.0.0"; - src = final.lib.cleanSource ./.; - npmDepsHash = "sha256-cIL9HRZIg8djOgFEuH7jwem7Eia7V5tPogONma+TO9U="; - npmBuildScript = "release"; - preConfigure = '' - substituteInPlace src/Explorer.tsx --replace-fail '../../organic/target/wasm32-unknown-unknown/js/wasm' '${final.organic.wasm_bundler}/share/bundler/wasm' - ''; - installPhase = '' - mkdir $out - runHook preInstall - cp -r dist/* "$out" - runHook postInstall - ''; - }; - }); + src = final.lib.cleanSource ./.; + npmDepsHash = "sha256-cIL9HRZIg8djOgFEuH7jwem7Eia7V5tPogONma+TO9U="; + npmBuildScript = "release"; + preConfigure = '' + substituteInPlace src/Explorer.tsx --replace-fail '../../organic/target/wasm32-unknown-unknown/js/wasm' '${wasm_bundler}/share/bundler/wasm' + ''; + installPhase = '' + mkdir $out + runHook preInstall + cp -r dist/* "$out" + runHook postInstall + ''; + }; + } + ); }; }; }