me
/
guix
Archived
1
0
Fork 0
Code
40,705 Commits
1 Branch
0 Tags
410 MiB
Commit Graph

6 Commits (d0cba11bc568a75070cae19fe3aed14ae8a524b5)

Author SHA1 Message Date
Ludovic Courtès 959eaa1eb8
daemon: Add "/guix" to default 'nixLibexecDir'. 
This makes it easier to run the uninstalled daemon.

* nix/local.mk (libstore_a_CPPFLAGS): Append "/guix" to
NIX_LIBEXEC_DIR.
* build-aux/pre-inst-env.in (NIX_LIBEXEC_DIR): Adjust comment.
* nix/libstore/builtins.cc (builtinDownload): Remove SUBDIR and its
use.
* nix/libstore/local-store.cc (runAuthenticationProgram): Ditto.
* nix/libstore/gc.cc (addAdditionalRoots): Remove "/guix" prefix.
* nix/nix-daemon/guix-daemon.cc (main): Ditto.
 2019-02-04 16:20:01 +01:00
Ludovic Courtès 4d4a38f620
daemon: Remove the 'NIX_SUBSTITUTERS' environment variable. 
* nix/libstore/globals.cc (Settings:update): Remove changes to
'substituters'.
* nix/nix-daemon/guix-daemon.cc (main): Set 'settings.substituters'
directly instead of changing the 'NIX_SUBSTITUTERS' environment variable.
* build-aux/pre-inst-env.in: Remove reference to 'NIX_SUBSTITUTERS'.
 2019-02-04 16:20:01 +01:00
Ludovic Courtès ea0a06cee2
Remove 'guix-register' and its traces. 
* Makefile.am (SH_TESTS): Remove tests/guix-register.sh.
* build-aux/pre-inst-env.in (GUIX_REGISTER): Remove.
* gnu/build/install.scm (directives): Remove outdated comment.
* gnu/build/vm.scm (root-partition-initializer): Update comment.
* gnu/packages/package-management.scm (guix-register): Remove.
* guix/config.scm.in (%sbindir, %guix-register-program): Remove.
* guix/scripts/system.scm (install): Adjust docstring.
* guix/self.scm (make-config.scm): Remove #:guix.  Do not generate
%sbindir and %guix-register-program.
(specification->package): Remove "guix".
* nix/guix-register/guix-register.cc: Remove.
* nix/libstore/store-api.cc (decodeValidPathInfo): Remove.
* nix/libstore/store-api.hh (decodeValidPathInfo): Remove declaration.
* nix/local.mk (sbin_PROGRAMS, guix_register_SOURCES)
(guix_register_CPPFLAGS, guix_register_LDFLAGS): Remove.
* tests/guix-register.sh: Remove.
 2018-06-14 11:17:00 +02:00
Eric Bavier 7740228e35
build: Set 'NIX_BUILD_HOOK' only if offloading is configured. 
This prevents libstore/build.cc from executing nix/scripts/offload, which is
always created by config.status, when offload support is not enabled.

* build-aux/pre-inst-env.in: Export 'NIX_BUILD_HOOK' only when
configured; unset it otherwise.
 2017-10-10 23:16:07 -05:00
Ludovic Courtès 19c1ac8d88
build: Unset 'NIX_BUILD_HOOK' when offloading support is missing. 
* build-aux/pre-inst-env.in: Export 'NIX_BUILD_HOOK' only when
nix/scripts/offload is executable; unset it otherwise.
 2017-03-08 23:42:52 +01:00
Mathieu Lirzin a1097caa6a build: Move environment '.in' scripts to 'build-aux' directory. 
* pre-inst-env.in: Move to ...
* build-aux/pre-inst-env.in: ... here.
* test-env.in: Move to ...
* build-aux/test-env.in: ... here.
* configure.ac (AC_CONFIG_FILES): Adapt to this.  Keep the generated
scripts in their current location which is $(top_builddir).
 2016-04-15 00:59:07 +02:00