From 144e3b4e9d825c68b6a07d68bae90ef06e6a7262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 9 Apr 2008 08:15:30 +0000
Subject: [PATCH] Guile: Use `share/guile/site' as the standard Guile module
 location.

svn path=/nixpkgs/trunk/; revision=11507
---
 pkgs/development/guile-modules/guile-lib/default.nix | 8 --------
 pkgs/development/interpreters/guile/setup-hook.sh    | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index cf566d34066..c96101ed539 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -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;
diff --git a/pkgs/development/interpreters/guile/setup-hook.sh b/pkgs/development/interpreters/guile/setup-hook.sh
index 114bc4e87cc..87cb5118506 100644
--- a/pkgs/development/interpreters/guile/setup-hook.sh
+++ b/pkgs/development/interpreters/guile/setup-hook.sh
@@ -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
 }