at 18.09-beta 42 lines 1.4 kB view raw
1diff --git a/build/scver.mk b/build/scver.mk 2index bdae8be..7539864 100644 3--- a/build/scver.mk 4+++ b/build/scver.mk 5@@ -98,33 +98,10 @@ endif 6 GITPRESENT := $(wildcard $(FDBDIR)/.git) 7 HGPRESENT := $(wildcard $(FDBDIR)/.hg) 8 9-# Use Git, if not missing 10-ifneq ($(GITPRESENT),) 11- SCVER := $(shell cd "$(FDBDIR)" && git --version 2>/dev/null) 12- ifneq ($(SCVER),) 13- VERSION_ID := $(shell cd "$(FDBDIR)" && git rev-parse --verify HEAD) 14- SOURCE_CONTROL := GIT 15- SCBRANCH := $(shell cd "$(FDBDIR)" && git rev-parse --abbrev-ref HEAD) 16- else 17-$(error Missing git executable on $(PLATFORM) ) 18- endif 19-# Otherwise, use Mercurial 20-else 21- # Otherwise, use Mercurial, if not missing 22- ifneq ($(HGPRESENT),) 23- SCVER := $(shell cd "$(FDBDIR)" && hg --version 2>/dev/null) 24- ifdef SCVER 25- VERSION_ID := $(shell cd "$(FDBDIR)" && hg id -n) 26- SOURCE_CONTROL := MERCURIAL 27- SCBRANCH := $(shell cd "$(FDBDIR)" && hg branch) 28- else 29-$(error Missing hg executable on $(PLATFORM)) 30- endif 31- else 32- FDBFILES := (shell ls -la $(FDBDIR)) 33-$(error Missing source control information for source on $(PLATFORM) in directory: $(FDBDIR) with files: $(FDBFILES)) 34- endif 35-endif 36+# NixOS-specific non-VCS packaging, filled out by the nix build 37+SOURCE_CONTROL := GIT 38+VERSION_ID := @NIXOS_FDB_VERSION_ID@ 39+SCBRANCH := @NIXOS_FDB_SCBRANCH@ 40 41 # Set the RELEASE variable based on the KVRELEASE variable. 42 ifeq ($(KVRELEASE),1)