add nix and nurl to runtime with env vars instead of wrapper

Author: figsoda

flake.nix

@@ -44,7 +44,6 @@
         installShellFiles
         libgit2_1_5
         libiconv
-        makeBinaryWrapper
         mkShell
         nix
         nixpkgs-fmt
@@ -59,11 +58,11 @@
       inherit (nixpkgs.lib)
         concatMapAttrs
         flip
+        getExe
         hasSuffix
         importTOML
         licenses
         maintainers
-        makeBinPath
         nameValuePair
         optionalAttrs
         optionals
@@ -111,7 +110,6 @@
         nativeBuildInputs = [
           curl
           installShellFiles
-          makeBinaryWrapper
           pkg-config
         ];
 
@@ -139,6 +137,8 @@
 
         env = {
           GEN_ARTIFACTS = "artifacts";
+          NIX = getExe nix;
+          NURL = getExe nurl;
           ZSTD_SYS_USE_PKG_CONFIG = true;
         };
 
@@ -194,8 +194,6 @@
       packages.default = buildPackage (args // {
         doCheck = false;
         postInstall = ''
-          wrapProgram $out/bin/nix-init \
-            --prefix PATH : ${makeBinPath [ nix nurl ]}
           installManPage artifacts/nix-init.1
           installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init
         '';

src/cmd.rs

@@ -0,0 +1,9 @@
+pub const NIX: &str = match option_env!("NIX") {
+    Some(nix) => nix,
+    None => "nix",
+};
+
+pub const NURL: &str = match option_env!("NURL") {
+    Some(nurl) => nurl,
+    None => "nurl",
+};

src/lang/rust/mod.rs

@@ -29,6 +29,7 @@ use std::{
 };
 
 use crate::{
+    cmd::NURL,
     inputs::AllInputs,
     lang::rust::deps::load_rust_dependency,
     prompt::{ask_overwrite, Prompter},
@@ -142,7 +143,7 @@ pub async fn write_cargo_lock(
         let hashes: BTreeMap<_, _> = revs
             .into_par_iter()
             .filter_map(|(rev, pkg)| {
-                let hash = Command::new("nurl")
+                let hash = Command::new(NURL)
                     .arg(pkg.source_id().as_url().to_string())
                     .arg(rev)
                     .arg("-Hf")

src/main.rs

@@ -1,6 +1,7 @@
 mod build;
 mod cfg;
 mod cli;
+mod cmd;
 mod fetcher;
 mod inputs;
 mod lang;
@@ -41,6 +42,7 @@ use crate::{
     build::{BuildType, PythonFormat, RustVendor},
     cfg::load_config,
     cli::Opts,
+    cmd::{NIX, NURL},
     fetcher::{Fetcher, PackageInfo, PypiFormat, Revisions, Version},
     inputs::{write_all_lambda_inputs, write_inputs, write_lambda_input, AllInputs},
     lang::{
@@ -150,16 +152,11 @@ async fn run() -> Result<()> {
         }
     };
 
-    let mut fetcher = serde_json::from_slice(
-        &Command::new("nurl")
-            .arg(&url)
-            .arg("-p")
-            .get_stdout()
-            .await?,
-    )
-    .context("failed to parse nurl output")?;
+    let mut fetcher =
+        serde_json::from_slice(&Command::new(NURL).arg(&url).arg("-p").get_stdout().await?)
+            .context("failed to parse nurl output")?;
 
-    let mut cmd = Command::new("nurl");
+    let mut cmd = Command::new(NURL);
     let mut licenses = BTreeMap::new();
     let mut pypi_format = PypiFormat::TarGz;
     let (pname, rev, version, desc, prefix, mut python_deps) =
@@ -348,7 +345,7 @@ async fn run() -> Result<()> {
         }
     };
 
-    let stdout = Command::new("nix")
+    let stdout = Command::new(NIX)
         .arg("build")
         .arg("--extra-experimental-features")
         .arg("nix-command")

src/utils.rs

@@ -4,6 +4,8 @@ use tracing::{error, info, warn};
 
 use std::{fmt::Display, future::Future, io::BufRead, pin::Pin, process::Output};
 
+use crate::cmd::NIX;
+
 pub const FAKE_HASH: &str = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
 
 pub trait ResultExt {
@@ -67,7 +69,7 @@ fn into_stdout(output: Output) -> Result<Vec<u8>> {
 }
 
 pub async fn fod_hash(expr: String) -> Option<String> {
-    let mut cmd = Command::new("nix");
+    let mut cmd = Command::new(NIX);
     cmd.arg("build")
         .arg("--extra-experimental-features")
         .arg("nix-command")