diff options
| author | Artturi <Artturin@artturin.com> | 2022-11-22 19:49:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-22 19:49:35 +0200 |
| commit | 761a5ba7d88cd132364266db08abc17ae7d92e1e (patch) | |
| tree | 11f526543139732d65818921c122892b630740d3 /lib | |
| parent | c54dea9fc0be5ad052ad059c6cd67ccf3c5e038e (diff) | |
| parent | f0e298c00272d745fba42be2c6e782cd2aa64444 (diff) | |
Merge pull request #202370 from Artturin/revertpartof1
Revert "lib/trivial: fix 'error: cannot decode virtual path '/nix/sto…
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/trivial.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/trivial.nix b/lib/trivial.nix index 70bc53016456c..881974a15e055 100644 --- 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 = ./.. + "/.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 |