restore nix

Author: milahu

default.nix

@@ -96,6 +96,7 @@ let
     git = git.out; # TODO why not just "git"
     inherit
       bwrapStaticBin
+      nix
       nixStaticBin
       prootStaticBin
       zstdStaticBin

runtimeScript.sh

@@ -4,6 +4,7 @@
 zstdStaticBin=@zstdStaticBin@
 prootStaticBin=@prootStaticBin@
 bwrapStaticBin=@bwrapStaticBin@
+nix=@nix@
 nixStaticBin=@nixStaticBin@
 busyboxStaticBin=@busyboxStaticBin@
 busyboxBins=(@busyboxBins@)
@@ -357,7 +358,7 @@ debug "NP_RUNTIME: $NP_RUNTIME"
 ### setup runtime args
 if [ "$NP_RUNTIME" == "nix" ]; then
   run="$NP_NIX shell -f $dir/mini-drv.nix -c"
-  PATH="$PATH:$store$(removePrefix "/nix/store" $nixStaticBin)/bin"
+  PATH="$PATH:$store$(removePrefix "/nix/store" $nix)/bin"
   export PATH
   NP_CONF_STORE="$dir"
   recreate_nix_conf
@@ -426,7 +427,7 @@ index="$(cat $storeTar/closureInfo/store-paths)"
   if [ -n "$missing" ]; then
     debug "registering new store paths to DB"
     # reg="$(cat $storeTar/closureInfo/registration)"
-    cmd="$run $store$(removePrefix "/nix/store" $nixStaticBin)/bin/nix-store --load-db"
+    cmd="$run $store$(removePrefix "/nix/store" $nix)/bin/nix-store --load-db"
     debug "running command: $cmd"
     # echo "$reg" | $cmd
   fi
@@ -451,11 +452,11 @@ elif [[ "$(basename "$0")" == nix-portable* ]]; then\
     bin="$(which "$2")"
     shift; shift
   else
-    bin="$store$(removePrefix "/nix/store" $nixStaticBin)/bin/$1"
+    bin="$store$(removePrefix "/nix/store" $nix)/bin/$1"
     shift
   fi
 else
-  bin="$store$(removePrefix "/nix/store" $nixStaticBin)/bin/$(basename "$0")"
+  bin="$store$(removePrefix "/nix/store" $nix)/bin/$(basename "$0")"
 fi
 
 
@@ -472,7 +473,7 @@ fi
 ### check if nix is functional with or without sandbox
 # sandbox-fallback is not reliable: https://github.com/NixOS/nix/issues/4719
 if [ "$newNPVersion" == "true" ] || [ "$lastRuntime" != "$NP_RUNTIME" ]; then
-  nixBin="$store$(removePrefix "/nix/store" $nixStaticBin)/bin/nix"
+  nixBin="$store$(removePrefix "/nix/store" $nix)/bin/nix"
   # if [ "$NP_RUNTIME" == "nix" ]; then
   #   nixBin="nix"
   # else
@@ -518,7 +519,7 @@ export PATH="$dir/tmpbin:$PATH"
 ### install git via nix, if git installation is not in /nix path
 if $doInstallGit && [ ! -e "$store$(removePrefix "/nix/store" $git)" ] ; then
   echo "Installing git. Disable this by specifying the git executable path with 'NP_GIT'"
-  $run "$store$(removePrefix "/nix/store" $nixStaticBin)/bin/nix" build --impure --no-link --expr "
+  $run "$store$(removePrefix "/nix/store" $nix)/bin/nix" build --impure --no-link --expr "
     (import $nixpkgsSrc {}).$gitAttribute.out
   "
 else