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

Changed the [solid-state-dependencies] list in the derivation to a single variable 'externalState' (since we also have a single state path) which can, for instance, be set to ~/.mozilla-test in the case of firefox (not bugfree yet)

Browse source
This commit is contained in:
Wouter den Breejen 2007-09-03 19:22:09 +00:00
parent 68cb244c90
commit 89ab441fd2
10 changed files with 118 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/nix-env/nix-env.cc
View file

@ -487,6 +487,8 @@ static void installDerivations(Globals & globals,
DrvInfos newElems;
queryInstSources(globals.state, globals.instSource, args, newElems, true);
StringPairs externalStates; //Mapping from statePath --> some path outide the store
StringSet newNames;
for (DrvInfos::iterator i = newElems.begin(); i != newElems.end(); ++i) {
/* `forceName' is a hack to get package names right in some
@ -501,11 +503,20 @@ static void installDerivations(Globals & globals,
{
DerivationStateOutputs stateOutputs = drv.stateOutputs;
string stateIdentifier = stateOutputs.find("state")->second.stateIdentifier;
printMsg(lvlError, format("Add '%2%' with '%1%'") % stateIdentifier % i->queryOutPath(globals.state) );
printMsg(lvlError, format("Add '%2%' with '%1%'") % stateIdentifier % i->queryOutPath(globals.state));
if(stateIdentifier == "")
i->setStateIdentifier("__EMTPY__");
else
i->setStateIdentifier(stateIdentifier);
//Later on we need to link the sharedState path out of the store to the statePath inside the state-store
string externalState = stateOutputs.find("state")->second.externalState;
Path statePath = stateOutputs.find("state")->second.statepath;
if(externalState != ""){
if(stateIdentifier != "")
externalState = externalState + "-" + stateIdentifier;
externalStates[statePath] = externalState;
}
}
if (globals.forceName != "")
@ -609,7 +620,41 @@ static void installDerivations(Globals & globals,
//Set in database
store->setSharedState(i->first, i->second);
}
//Let the stateDirs in /nix/state point to the solidStateDependencies
for (StringPairs::iterator i = externalStates.begin(); i != externalStates.end(); ++i){
Path statePath = i->first;
Path externalState = i->second;
//1. If dir externalState exists, we move its data into the statePath
//2. We ensure that the parent dir of externalState exists so we can create a symlink
if(IsDirectory(externalState)){
copyContents(externalState, statePath);
//TODO !!!!!!!!!!!!!!
//cp: cannot stat `/home/wouterdb/test/aaaaaaaa-test/*': No such file or directory
//error: program `cp' failed with exit code 1
deletePath(externalState);
}
else{
//Ensure parent dir
//outsidestorePath
//ensureDirExists();
}
//TODO !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! these last 2 items should be done by the store I think for security reasons !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// /nix/state should be root.nixbl and 775
//Now we create a symlink externalState --> statePath
printMsg(lvlError, format("SYMLINK: '%1%' --> '%2%'") % externalState % statePath);
symlinkPath(statePath, externalState);
//SET IN DB !!!
//TODO
}
}