Commit b67ee6e8 authored by Artturin's avatar Artturin
Browse files

lib/trivial: fix 'error: cannot decode virtual path... 

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

happens on lazy-trees branch of Nix (NixOS/nix#6530)
parent 1f3ebb2b

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 = "${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