diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-05 16:29:28 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-05 16:29:28 +0100 |
| commit | f5c82e15e0e76b855bc4cc88ffb79331b7083f39 (patch) | |
| tree | be5fa23b0899617c411afca2413655bb1d073ab7 /nix/sync-with-upstream | |
| parent | 8b15ac6700f1345e9efa709dea6e4efcbdaf6d7a (diff) | |
| download | guix-patches-f5c82e15e0e76b855bc4cc88ffb79331b7083f39.tar guix-patches-f5c82e15e0e76b855bc4cc88ffb79331b7083f39.tar.gz | |
daemon: Add `list-runtime-roots' script.
* nix/scripts/list-runtime-roots.in: New file.
* config-daemon.ac: Add `AC_CONFIG_FILES' invocation for it.
* daemon.am (nodist_pkglibexec_SCRIPTS): New variable.
(AM_TESTS_ENVIRONMENT): Define `top_builddir'.
* tests/guix-daemon.sh: Export `NIX_ROOT_FINDER'.
* nix/sync-with-upstream: Substitute the path to the root finder in
libstore/gc.cc.
Diffstat (limited to 'nix/sync-with-upstream')
| -rwxr-xr-x | nix/sync-with-upstream | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream index 324dcb27c9..69bd1fbee7 100755 --- a/nix/sync-with-upstream +++ b/nix/sync-with-upstream @@ -62,3 +62,7 @@ do done cp -v "$top_srcdir/nix-upstream/"{COPYING,AUTHORS} "$top_srcdir/nix" + +# Substitutions. +sed -i "$top_srcdir/nix/libstore/gc.cc" \ + -e 's|/nix/find-runtime-roots\.pl|/guix/list-runtime-roots|g' |