Unverified Commit 761a5ba7 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #202370 from Artturin/revertpartof1 

Revert "lib/trivial: fix 'error: cannot decode virtual path '/nix/sto…
parents c54dea9f f0e298c0

lib/trivial.nix

+2 −2
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ rec { 
    # Default value to return if revision can not be determined

    default:

    let

      revisionFile = ./.. + "/.git-revision";

      gitRepo      = ./.. + "/.git";

      revisionFile = "${toString ./..}/.git-revision";

      gitRepo      = "${toString ./..}/.git";

    in if lib.pathIsGitRepo gitRepo

       then lib.commitIdFromGitRepo gitRepo

       else if lib.pathExists revisionFile then lib.fileContents revisionFile