diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
| commit | ed1b0d0bac6438fbfcb2dca77493edcbe3384114 (patch) | |
| tree | d9ddecb505723c8c45ca2837e08e121f41b49fd2 /lib/trivial.nix | |
| parent | 960f062825d22e328828766f4910b702f81ddade (diff) | |
| parent | de66fc6a2a2483f4bbbb759c55176643df6e38ba (diff) | |
Merge master into staging-next
Diffstat (limited to 'lib/trivial.nix')
| -rw-r--r-- | lib/trivial.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/trivial.nix b/lib/trivial.nix index 3a25e31fb052..940ec1a3d59e 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -191,7 +191,7 @@ rec { let revisionFile = "${toString ./..}/.git-revision"; gitRepo = "${toString ./..}/.git"; - in if lib.pathIsDirectory gitRepo + in if builtins.pathExists gitRepo then lib.commitIdFromGitRepo gitRepo else if lib.pathExists revisionFile then lib.fileContents revisionFile else default; |