puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Don't use a hard-coded path.

Browse source
This commit is contained in:
Eelco Dolstra 2003-11-22 21:12:36 +00:00
parent 9486dda115
commit af7e6fe22e
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -41,6 +41,7 @@ AC_CONFIG_FILES([Makefile
corepkgs/Makefile corepkgs/Makefile
corepkgs/fetchurl/Makefile corepkgs/fetchurl/Makefile
corepkgs/nar/Makefile corepkgs/nar/Makefile
corepkgs/buildenv/Makefile
doc/Makefile doc/Makefile
doc/manual/Makefile doc/manual/Makefile
]) ])

2
corepkgs/Makefile.am
View file

@ -1 +1 @@
SUBDIRS = fetchurl nar SUBDIRS = fetchurl nar buildenv

9
corepkgs/buildenv/Makefile.am Normal file
View file

@ -0,0 +1,9 @@
install-exec-local:
$(INSTALL) -d $(datadir)/nix/corepkgs
$(INSTALL) -d $(datadir)/nix/corepkgs/buildenv
$(INSTALL_DATA) default.nix $(datadir)/nix/corepkgs/buildenv
$(INSTALL_PROGRAM) builder.pl $(datadir)/nix/corepkgs/buildenv
include ../../substitute.mk
EXTRA_DIST = default.nix builder.pl

2
src/nix-env/main.cc
View file

@ -164,7 +164,7 @@ void switchLink(Path link, Path target)
void createUserEnv(EvalState & state, const DrvInfos & drvs) void createUserEnv(EvalState & state, const DrvInfos & drvs)
{ {
/* Get the environment builder expression. */ /* Get the environment builder expression. */
Expr envBuilder = parseExprFromFile("/home/eelco/nix/corepkgs/buildenv"); /* !!! */ Expr envBuilder = parseExprFromFile(nixDataDir + "/nix/corepkgs/buildenv"); /* !!! */
/* Construct the whole top level derivation. */ /* Construct the whole top level derivation. */
ATermList inputs = ATempty; ATermList inputs = ATempty;