feat: do not rely on nix experimental

mobusoperandi · Jun 16, 2024 · 15e84f7 · 15e84f7
1 parent 70607b5
commit 15e84f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/flake.nix b/flake.nix
@@ -24,7 +24,7 @@
       pkgs = nixpkgs.legacyPackages.${system};
       toolchain = fenix.packages.${system}.stable.completeToolchain;
       craneLib = crane.lib.${system}.overrideToolchain toolchain;
-      NIX_CMD_PATH = "${nix.packages.${system}.nix}/bin/nix";
+      NIX_BIN_DIR = "${nix.packages.${system}.nix}/bin";
 
       commonArgs = {
         src = craneLib.cleanCargoSource (craneLib.path ./.);
@@ -36,7 +36,7 @@
       packages.default = craneLib.buildPackage (
         commonArgs
         // {
-          inherit cargoArtifacts NIX_CMD_PATH;
+          inherit cargoArtifacts NIX_BIN_DIR;
           nativeCheckInputs = [pkgs.nix];
           # 1. integration tests execute `nix`, which fails creating `/nix/var`
           # 2. integration tests require `/dev/ptmx`
@@ -45,7 +45,7 @@
       );
 
       devShells.default = craneLib.devShell {
-        inherit NIX_CMD_PATH;
+        inherit NIX_BIN_DIR;
         inputsFrom = [self.packages.${system}.default];
         packages = [
           toolchain

diff --git a/src/expression/driver.rs b/src/expression/driver.rs
@@ -71,8 +71,8 @@ impl ExpressionDriver {
     }
 
     async fn spawn_nix(&mut self, example: ExpressionExample) {
-        let task = tokio::process::Command::new(env!("NIX_CMD_PATH"))
-            .args(["eval", "--expr"])
+        let task = tokio::process::Command::new(concat!(env!("NIX_BIN_DIR"), "/nix-instantiate"))
+            .args(["--expr", "--eval"])
             .arg(example.expression)
             .output();
 

diff --git a/src/repl/driver.rs b/src/repl/driver.rs
@@ -135,7 +135,7 @@ impl ReplDriver {
     async fn spawn(&mut self, id: ExampleId) {
         let (read_output, write_output) = nix::unistd::pipe().unwrap();
 
-        let child = tokio::process::Command::new(env!("NIX_CMD_PATH"))
+        let child = tokio::process::Command::new(concat!(env!("NIX_BIN_DIR"), "/nix"))
             // even though a single `--quiet` would normally disable the pre-prompt message
             // (at the time of writing `Nix 2.21.1`), two seem to be necessary here.
             .args(["repl", "--quiet", "--quiet"])