GNU Guile 2.0: Provide a 2.0ish setup hook.
svn path=/nixpkgs/trunk/; revision=34215
This commit is contained in:
@@ -46,7 +46,7 @@
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook-2.0.sh;
|
||||||
|
|
||||||
crossAttrs.preConfigure =
|
crossAttrs.preConfigure =
|
||||||
stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu")
|
stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu")
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
addGuileLibPath () {
|
||||||
|
if test -d "$1/share/guile/site/2.0"
|
||||||
|
then
|
||||||
|
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0"
|
||||||
|
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0"
|
||||||
|
elif test -d "$1/share/guile/site"
|
||||||
|
then
|
||||||
|
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
|
||||||
|
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
envHooks=(${envHooks[@]} addGuileLibPath)
|
||||||
Reference in New Issue
Block a user