Don't depend on git when generating source tarball

NixOS · Oct 15, 2015 · a7dd269 · a7dd269
1 parent 164487a
commit a7dd269
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/local.mk b/local.mk
@@ -1,5 +1,6 @@
 ifeq ($(MAKECMDGOALS), dist)
- dist-files += $(shell git ls-files)
+ # Make sure we are in repo root with `--git-dir`
+ dist-files += $(shell git --git-dir=.git ls-files || find * -type f)
 endif
 
 dist-files += configure config.h.in nix.spec

diff --git a/release.nix b/release.nix
@@ -36,7 +36,9 @@ let
 
  postUnpack = ''
  # Clean up when building from a working tree.
- git -C $sourceRoot clean -fd
+ if [[ -d $sourceRoot/.git ]]; then
+ git -C $sourceRoot clean -fd
+ fi
  '';
 
  preConfigure = ''