diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/libstore/store-api.cc | 2 | ||||
| -rw-r--r-- | nix/local.mk | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/nix/libstore/store-api.cc b/nix/libstore/store-api.cc index 781fb9e693..38a1403a71 100644 --- a/nix/libstore/store-api.cc +++ b/nix/libstore/store-api.cc @@ -61,7 +61,7 @@ void checkStoreName(const string & name) /* Disallow names starting with a dot for possible security reasons (e.g., "." and ".."). */ if (string(name, 0, 1) == ".") - throw Error(format("invalid name: `%1%'") % name); + throw Error(format("invalid name: `%1%' (can't begin with dot)") % name); foreach (string::const_iterator, i, name) if (!((*i >= 'A' && *i <= 'Z') || (*i >= 'a' && *i <= 'z') || diff --git a/nix/local.mk b/nix/local.mk index 8a2b2b88e8..0d23a48a02 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -69,7 +69,8 @@ libutil_headers = \ libutil_a_CPPFLAGS = \ -I$(top_builddir)/nix \ -I$(top_srcdir)/%D%/libutil \ - $(libformat_a_CPPFLAGS) + $(libformat_a_CPPFLAGS) \ + $(LIBGCRYPT_CPPFLAGS) libstore_a_SOURCES = \ %D%/libstore/gc.cc \ @@ -109,7 +110,7 @@ libstore_a_CPPFLAGS = \ -DDEFAULT_CHROOT_DIRS="\"\"" libstore_a_CXXFLAGS = $(AM_CXXFLAGS) \ - $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) + $(SQLITE3_CFLAGS) bin_PROGRAMS = guix-daemon @@ -122,6 +123,9 @@ guix_daemon_CPPFLAGS = \ $(libutil_a_CPPFLAGS) \ -I$(top_srcdir)/%D%/libstore +guix_daemon_LDFLAGS = \ + $(LIBGCRYPT_LDFLAGS) + guix_daemon_LDADD = \ libstore.a libutil.a libformat.a -lz \ $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) |