build error

src/libstore/Makefile.am

@@ -9,7 +9,8 @@ pkginclude_HEADERS = \
  globals.hh db.hh references.hh pathlocks.hh \
  worker-protocol.hh
 
-libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la
+libstore_la_LIBADD = ../libutil/libutil.la \
+ ../boost/format/libformat.la
 
 BUILT_SOURCES = derivations-ast.cc derivations-ast.hh
 

src/libstore/derivations-ast.def

@@ -8,7 +8,7 @@ Derive | ATermList ATermList ATermList ATermList ATermList string string ATermLi
 | string ATermList | ATerm | DerivationInput |
 | string string string string | ATerm | DerivationOutput |
 | string string string string string string string | ATerm | DerivationStateOutput |
-| string string string string | ATerm | DerivationStateOutputDir |
+| string string string | ATerm | DerivationStateOutputDir |
 
 Closure | ATermList ATermList | ATerm | OldClosure |
 | string ATermList | ATerm | OldClosureElem |

src/libstore/derivations.cc

@@ -102,8 +102,9 @@ Derivation parseDerivation(ATerm t)
     //parse state dirs part
     for (ATermIterator i(stateOutDirs); i; ++i) {
         ATerm id, path, type, interval;
-        if (!matchDerivationStateOutputDir(*i, id, path, type, interval))
+        if (!matchDerivationStateOutputDir(*i, id, /*path,*/ type, interval))
             throwBadDrv(t);
+        path = id;    
         DerivationStateOutputDir stateOutDirs;
         stateOutDirs.path = aterm2String(path);
         stateOutDirs.type = aterm2String(type);
@@ -175,7 +176,7 @@ ATerm unparseDerivation(const Derivation & drv)
         stateOutputDirs = ATinsert(stateOutputDirs,
             makeDerivationStateOutputDir(
                 toATerm(i->first),
-                toATerm(i->second.path),
+                //toATerm(i->second.path),
                 toATerm(i->second.type),
                 toATerm(i->second.interval)
                 ));

src/libstore/globals.cc

@@ -10,10 +10,12 @@ namespace nix {
 
 string nixStore = "/UNINIT";
 string nixStoreState = "/UNINIT";
+string nixStoreStateRepos = "/UNINIT";
 string nixDataDir = "/UNINIT";
 string nixLogDir = "/UNINIT";
 string nixStateDir = "/UNINIT";
 string nixDBPath = "/UNINIT";
+string nixSVNPath = "/UNINIT";
 string nixConfDir = "/UNINIT";
 string nixLibexecDir = "/UNINIT";
 string nixBinDir = "/UNINIT";

src/libstore/globals.hh

@@ -18,12 +18,21 @@ extern string nixDataDir; /* !!! fix */
 /* nixLogDir is the directory where we log various operations. */ 
 extern string nixLogDir;
 
-/* nixStateDir is the directory where the state dirs of the components are stored.  */
+/* nixStoreState is the directory where the state dirs of the components are stored.  */
 extern string nixStoreState;
 
+/* nixStoreState is the directory where the repositorys of the state dirs of the components are stored.  */
+extern string nixStoreStateRepos;
+
+/* nixStateDir is the directory where state is stored. */
+extern string nixStateDir;
+
 /* nixDBPath is the path name of our Berkeley DB environment. */
 extern string nixDBPath;
 
+/* nixSVNPath is the path name of our SVN environment. */
+extern string nixSVNPath;
+
 /* nixConfDir is the directory where configuration files are
    stored. */
 extern string nixConfDir;
@@ -35,7 +44,6 @@ extern string nixLibexecDir;
 /* nixBinDir is the directory where the main programs are stored. */
 extern string nixBinDir;
 
-
 /* Misc. global flags. */
 
 /* Whether to keep temporary directories of failed builds. */

src/libstore/store-api.cc

@@ -85,7 +85,7 @@ Path makeStatePath(const string & type, const Hash & hash, const string & suffix
     string s = type + ":sha256:" + printHash(hash) + ":"
         + nixStoreState + ":" + suffix;
 
-    checkStoreName(suffix);
+    checkStoreName(suffix);											//should this be here?
 
     return nixStoreState + "/"
         + printHash32(compressHash(hashString(htSHA256, s), 20))

src/libstore/store-api.hh

@@ -204,6 +204,9 @@ Path makeStorePath(const string & type,
 Path makeFixedOutputPath(bool recursive,
     string hashAlgo, Hash hash, string name);
 
+/* Constructs a unique store state path name. */
+Path makeStatePath(const string & type, const Hash & hash, const string & suffix);
+
 
 /* This is the preparatory part of addToStore() and addToStoreFixed();
    it computes the store path to which srcPath is to be copied.