Commit 3ddf429e authored by Valentin Reis's avatar Valentin Reis

added PATH inheritance.

parent 9e6d3ca6
Pipeline #5836 passed with stage
in 6 minutes and 51 seconds
......@@ -339,11 +339,13 @@ setupSystem target sa = do
varXDG_CACHE_HOME <- rpVerbose "mktemp" ["-d", "/tmp/deletable-nix-cache-XXXX"] []
varTMPDIR <- createAndSetTMPDIR "nixtmpdir"
varNIX_PATH <- toS <$> SE.getEnv "NIX_PATH"
varPATH <- toS <$> SE.getEnv "PATH"
let envVars =
[ ("XDG_CACHE_HOME", varXDG_CACHE_HOME)
, ("TMPDIR" , varTMPDIR)
, ("NIX_PATH" , varNIX_PATH)
, ("PATH" , varPATH)
]
when (isTarget target) $ setupNodeOs envVars
......@@ -416,10 +418,6 @@ wrap nixCommand target sa@ArgsCommon {..} = do
remotely :: Text -> ArgsCommon -> ArgsRemote -> IO ()
remotely _ _ _ = putText "unsupported in this version" >> undefined
-- Sources of impurity for this build are: "/tmp/ /etc/argo/ /var/run/
-- /var/lock/. Moreover, sandboxing is disabled, in particular because of:
-- /tmp/nrm-* sockets, /etc/argo, /var/run/, /var/lock/ which all need read
-- access. until these components are patched to allow for alternative paths,
-- no sandbox use is possible. If sandbox paths were read only we could add:
{-, "--option"-}
{-, "build-use-sandbox"-}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment