mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Sync with the trunk.

Browse source
This commit is contained in:
Eelco Dolstra 2010-03-11 10:52:52 +00:00
commit 070057c1b9
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -141,6 +141,7 @@ AC_PATH_PROG(w3m, w3m, false)
AC_PATH_PROG(flex, flex, false) AC_PATH_PROG(flex, flex, false)
AC_PATH_PROG(bison, bison, false) AC_PATH_PROG(bison, bison, false)
NEED_PROG(perl, perl) NEED_PROG(perl, perl)
NEED_PROG(sed, sed)
NEED_PROG(tar, tar) NEED_PROG(tar, tar)
AC_PATH_PROG(dot, dot) AC_PATH_PROG(dot, dot)
AC_PATH_PROG(dblatex, dblatex) AC_PATH_PROG(dblatex, dblatex)

2
scripts/nix-prefetch-url.in
View file

@ -24,7 +24,7 @@ fi
# Handle escaped characters in the URI. `+', `=' and `?' are the only # Handle escaped characters in the URI. `+', `=' and `?' are the only
# characters that are valid in Nix store path names but have a special # characters that are valid in Nix store path names but have a special
# meaning in URIs. # meaning in URIs.
name=$(basename "$url" | sed -e 's/%2b/+/g' -e 's/%3d/=/g' -e 's/%3f/\?/g') name=$(basename "$url" | @sed@ -e 's/%2b/+/g' -e 's/%3d/=/g' -e 's/%3f/\?/g')
if test -z "$name"; then echo "invalid url"; exit 1; fi if test -z "$name"; then echo "invalid url"; exit 1; fi

11
src/libstore/build.cc
View file

@ -1566,16 +1566,17 @@ void DerivationGoal::startBuilder()
createDirs(chrootTmpDir); createDirs(chrootTmpDir);
chmod(chrootTmpDir, 01777); chmod(chrootTmpDir, 01777);
/* Create a /etc/passwd with entries for the build user and /* Create a /etc/passwd with entries for the build user and the
the nobody account. The latter is kind of a hack to nobody account. The latter is kind of a hack to support
support Samba-in-QEMU. */ Samba-in-QEMU. */
createDirs(chrootRootDir + "/etc"); createDirs(chrootRootDir + "/etc");
writeFile(chrootRootDir + "/etc/passwd", writeFile(chrootRootDir + "/etc/passwd",
(format( (format(
"nixbld:x:%1%:65534:Nix build user:/:/noshell\n" "nixbld:x:%1%:%2%:Nix build user:/:/noshell\n"
"nobody:x:65534:65534:Nobody:/:/noshell\n") "nobody:x:65534:65534:Nobody:/:/noshell\n")
% (buildUser.enabled() ? buildUser.getUID() : getuid())).str()); % (buildUser.enabled() ? buildUser.getUID() : getuid())
% (buildUser.enabled() ? buildUser.getGID() : getgid())).str());
/* Bind-mount a user-configurable set of directories from the /* Bind-mount a user-configurable set of directories from the
host file system. The `/dev/pts' directory must be mounted host file system. The `/dev/pts' directory must be mounted

1
substitute.mk
View file

@ -16,6 +16,7 @@
-e "s^@bzip2_bin_test\@^$(bzip2_bin_test)^g" \ -e "s^@bzip2_bin_test\@^$(bzip2_bin_test)^g" \
-e "s^@perl\@^$(perl)^g" \ -e "s^@perl\@^$(perl)^g" \
-e "s^@coreutils\@^$(coreutils)^g" \ -e "s^@coreutils\@^$(coreutils)^g" \
-e "s^@sed\@^$(sed)^g" \
-e "s^@tar\@^$(tar)^g" \ -e "s^@tar\@^$(tar)^g" \
-e "s^@gzip\@^$(gzip)^g" \ -e "s^@gzip\@^$(gzip)^g" \
-e "s^@tr\@^$(tr)^g" \ -e "s^@tr\@^$(tr)^g" \