summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-06-17 23:54:39 +0200
committerLudovic Courtès <ludo@gnu.org>2013-06-18 00:12:22 +0200
commit8cf13c1f70ac2f3d1886f2d521b16915fc3f9d29 (patch)
treea383917de800dc5632ee5a74b3cdf3266f1dbe22 /nix
parent90a0048f5e1ac161fb7a32b361fe35564caabaf9 (diff)
downloadguix-8cf13c1f70ac2f3d1886f2d521b16915fc3f9d29.tar.gz
guix-8cf13c1f70ac2f3d1886f2d521b16915fc3f9d29.tar.xz
build: Fix `sync-with-upstream'.
* nix/sync-with-upstream: Remove schema.sql.hh.
Diffstat (limited to 'nix')
-rwxr-xr-xnix/sync-with-upstream5
1 files changed, 4 insertions, 1 deletions
diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream
index 66a315a643..535763d602 100755
--- a/nix/sync-with-upstream
+++ b/nix/sync-with-upstream
@@ -1,6 +1,6 @@
#!/bin/sh
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
@@ -61,6 +61,9 @@ do
fi
done
+# This file should be generated by our build system so remove it.
+rm -fv "$top_srcdir/nix/libstore/schema.sql.hh"
+
cp -v "$top_srcdir/nix-upstream/COPYING" "$top_srcdir/nix"
cp -v "$top_srcdir/nix-upstream/AUTHORS" "$top_srcdir/nix"