lib/trivial: fix 'error: cannot decode virtual path '/nix/store/virtual0000000000000000000000005-source''

Artturin · Artturin · commit b67ee6e86190 · 2022-11-06T07:04:53.000+02:00
happens on lazy-trees branch of Nix (NixOS/nix#6530)
diff --git a/lib/trivial.nix b/lib/trivial.nix
@@ -213,8 +213,8 @@ rec {
     # Default value to return if revision can not be determined
     default:
     let
-      revisionFile = "${toString ./..}/.git-revision";
-      gitRepo      = "${toString ./..}/.git";
+      revisionFile = ./.. + "/.git-revision";
+      gitRepo      = ./.. + "/.git";
     in if lib.pathIsGitRepo gitRepo
        then lib.commitIdFromGitRepo gitRepo
        else if lib.pathExists revisionFile then lib.fileContents revisionFile
