Fix examples.

thomashoneyman · Feb 2, 2024 · 95b06ed · 95b06ed
1 parent ba1b2c1
commit 95b06ed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/generate/default.nix b/generate/default.nix
@@ -13,8 +13,7 @@
   purs-backend-es,
   purs-tidy,
 }: let
-  npmDependencies = slimlock.buildPackageLock {src = ./.;};
-  packages = purix.buildSpagoLock {
+  locked = purix.buildSpagoLock {
     src = ./.;
     corefn = true;
   };
@@ -30,8 +29,8 @@ in
     buildInputs = [prefetch-npm-deps];
 
     buildPhase = ''
-      ln -s ${npmDependencies}/js/node_modules .
-      cp -r ${packages.${name}}/output .
+      ln -s ${locked.npmDependencies}/js/node_modules .
+      cp -r ${locked.jsArtifacts.${name}}/output .
       set -f
       echo "Optimizing..."
       purs-backend-es build

diff --git a/nix/examples/simple-ffi/default.nix b/nix/examples/simple-ffi/default.nix
@@ -2,12 +2,10 @@
   stdenv,
   writeText,
   esbuild,
-  slimlock,
   purix,
   purs-bin,
 }: let
-  packageLock = slimlock.buildPackageLock {src = ./.;};
-  spagoLock = purix.buildSpagoLock {src = ./.;};
+  locked = purix.buildSpagoLock {src = ./.;};
   entrypoint = writeText "entrypoint.js" ''
     import { main } from "./output/Main";
     main();
@@ -19,8 +17,8 @@ in
     nativeBuildInputs = [purs-bin.purs-0_15_9 esbuild];
     buildPhase = ''
       echo "Linking ..."
-      ln -s ${packageLock}/js/node_modules .
-      cp -r ${spagoLock.simple-ffi}/output .
+      ln -s ${locked.npmDependencies}/js/node_modules .
+      cp -r ${locked.jsArtifacts.simple-ffi}/output .
       cp ${entrypoint} entrypoint.js
       cat entrypoint.js
       esbuild entrypoint.js \

diff --git a/nix/examples/simple/default.nix b/nix/examples/simple/default.nix
@@ -2,7 +2,7 @@
   stdenv,
   purix,
 }: let
-  lock = purix.buildSpagoLock {
+  locked = purix.buildSpagoLock {
     src = ./.;
     lockfile = ./spago.lock;
   };
@@ -12,7 +12,7 @@ in
     src = ./.;
     buildPhase = ''
       echo "Linking ..."
-      ln -s ${lock.simple}/output .
+      ln -s ${locked.jsArtifacts.simple}/output .
     '';
     installPhase = ''
       mkdir -p $out