forked from mirrors/nixpkgs
Guile: Use `share/guile/site' as the standard Guile module location.
svn path=/nixpkgs/trunk/; revision=11507
This commit is contained in:
parent
4126f26c7e
commit
144e3b4e9d
|
@ -19,14 +19,6 @@ stdenv.mkDerivation rec {
|
|||
then
|
||||
rm -f "$out/share/guile/site/srfi/srfi-35.scm"
|
||||
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;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
addGuileLibPath () {
|
||||
if test -d "$1/lib/site-guile"
|
||||
if test -d "$1/share/guile/site"
|
||||
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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue