Merge pull request #5369 from NixOS/fix-invalid-rethrows

(partially) Revert "Don't copy in rethrow"

src/libexpr/primops.cc

@@ -575,7 +575,7 @@ static Bindings::iterator getAttr(
             // Adding another trace for the function name to make it clear
             // which call received wrong arguments.
             e.addTrace(pos, hintfmt("while invoking '%s'", funcName));
-            throw;
+            throw e;
         }
     }
 

src/libstore/build/local-derivation-goal.cc

@@ -948,7 +948,7 @@ void LocalDerivationGoal::startBuilder()
             FdSource source(builderOut.readSide.get());
             auto ex = readError(source);
             ex.addTrace({}, "while setting up the build environment");
-            throw;
+            throw ex;
         }
         debug("sandbox setup: " + msg);
         msgs.push_back(std::move(msg));