src/libmain/shared.cc

@@ -138,6 +138,11 @@ static void initAndRun(int argc, char * * argv)
     while (argc--) args.push_back(*argv++);
     args.erase(args.begin());
     
+    /* We dont expand for nix-state since we need to pass arguments to other 
+     * programs that can decide for themselves if they want expansion or not 
+     */
+    if(programId != "nix-state")	 
+    {
 	    /* Expand compound dash options (i.e., `-qlf' -> `-q -l -f'), and
 	       ignore options for the ATerm library. */
 	    for (Strings::iterator i = args.begin(); i != args.end(); ++i) {
@@ -155,6 +160,7 @@ static void initAndRun(int argc, char * * argv)
 	    }
 	    args = remaining;
 	    remaining.clear();
+    }
 
     /* Process default options. */
     for (Strings::iterator i = args.begin(); i != args.end(); ++i) {

src/libstore/build.cc

@@ -1915,6 +1915,7 @@ void DerivationGoal::deleteTmpDir(bool force)
         }
         else
 			deletePathWrapped(tmpDir);
+            
         tmpDir = "";
     }
 }

src/nix-env/nix-env.cc

@@ -650,6 +650,7 @@ static void installDerivations(Globals & globals,
     			externalState_p.erase(externalState_p.length(),1);
     		externalState_p = externalState_p.substr(0,externalState_p.find_last_of('/'));
     		ensureDirExists(externalState_p);
+    		//printMsg(lvlError, format("EnsureDir: '%1%'") % externalState_p);
     	}
     	
     	//Now we create a symlink externalState --> statePath

src/nix-state/nix-state.cc

@@ -594,8 +594,10 @@ void run(Strings args)
         	username = arg.substr(7,arg.length());
         	
 
-        else
+        else{
             opArgs.push_back(arg);
+            //printMsg(lvlInfo, format("ARG: %1%") % arg);
+        }
 
 		//in the startscript u can have --run, but could do showrevisions
         if (oldOp && oldOp != op && oldOp != opRunComponent)