Guile: Use `share/guile/site' as the standard Guile module location.

svn path=/nixpkgs/trunk/; revision=11507
This commit is contained in:
Ludovic Courtès 2008-04-09 08:15:30 +00:00
parent 4126f26c7e
commit 144e3b4e9d
2 changed files with 2 additions and 10 deletions

View File

@ -19,14 +19,6 @@ stdenv.mkDerivation rec {
then then
rm -f "$out/share/guile/site/srfi/srfi-35.scm" rm -f "$out/share/guile/site/srfi/srfi-35.scm"
fi fi
# Make modules available under `/lib/site-guile' to comply with Guile's
# setup-hook.
mkdir -p "$out/lib/site-guile"
for f in "$out/share/guile/site"/*
do
ln -s "$f" "$out/lib/site-guile/"
done
''; '';
doCheck = true; doCheck = true;

View File

@ -1,7 +1,7 @@
addGuileLibPath () { addGuileLibPath () {
if test -d "$1/lib/site-guile" if test -d "$1/share/guile/site"
then then
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/lib/site-guile" export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
fi fi
} }