nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-26 04:00:59 +01:00
Code Activity

Browse source
This commit is contained in:
Wouter den Breejen 2007-09-17 15:38:13 +00:00
parent e80c7bda4c
commit 315cd18337
5 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libexpr/primops.cc
View file

@ -340,7 +340,7 @@ static Hash hashDerivationModulo(EvalState & state, Derivation drv)
* If this drv doesnt have runtime paramters: The state indentifier and thus statepath may change, and thus the componentPath changes since it is build with another identifier
* In both cases: Other runtime state parameters like stateDirs, synchronisation and shareState never change the out or statepath so always need to be out of the hash
*/
if(drv.stateOutputs.size() != 0){
if(isStateDrv(drv)){
if(drv.stateOutputs.size() != 1)
throw EvalError(format("There are more then one stateOutputs in the derviation....."));
@ -655,7 +655,14 @@ static Expr prim_derivationStrict(EvalState & state, const ATermVector & args)
ATermMap outAttrs(2);
outAttrs.set(toATerm("outPath"), makeAttrRHS(makeStr(outPath, singleton<PathSet>(drvPath)), makeNoPos()));
outAttrs.set(toATerm("drvPath"), makeAttrRHS(makeStr(drvPath, singleton<PathSet>(drvPath)), makeNoPos()));
if(enableState && !disableState)
/* TODO !!!!!!!!!!!!!!!!!!!! Recheck this !!!!!!!!!!!!!!!!!!!!
* We now always set the statePath since someone might 'convert' and old non-state expression into a state expression like this:
* let oldDrv = import ../../applications/networking/mailreaders/thunderbird-2.x;
* newDrv = stdenv.mkDerivation( oldDrv { ... } // { name = "x-state-v"; stateDirs = [ ... ]; } );
* in newDrv
*/
//if(enableState && !disableState)
outAttrs.set(toATerm("statePath"), makeAttrRHS(makeStr(stateOutPath, singleton<PathSet>(drvPath)), makeNoPos()));
return makeAttrs(outAttrs);