* Update Go's version. Make 8g & 8l commands working with no need of

extra argument to locate the Go's libraries.

svn path=/nixpkgs/trunk/; revision=18376

pkgs/development/compilers/go/default.nix

@@ -1,7 +1,7 @@
-{stdenv, fetchhg, bison, glibc, ed, which, bash, ...}:
+{stdenv, fetchhg, bison, glibc, ed, which, bash, makeWrapper, ...}:
 
 let
-  version = "2009-11-10.1";
+  version = "2009-11-12";
   md5 = "66e5803c8dc2855b339151918b6b0de5";
 in
 
@@ -15,11 +15,10 @@ stdenv.mkDerivation {
     inherit md5;
   };
 
-  buildInputs = [ bison glibc ed which bash ];
+  buildInputs = [ bison glibc ed which bash makeWrapper ];
 
   patches = [
     ./disable-system-dependent-tests.patch
-    ./pkg-log-test-accept-period-in-file-path.patch
     ./cgo-set-local-to-match-gcc-error-messages.patch
   ];
 
@@ -35,7 +34,6 @@ stdenv.mkDerivation {
   GOARCH = "386";
 
   installPhase = ''
-    ensureDir "$out"
     ensureDir "$out/bin"
     export GOROOT="$(pwd)/"
     export GOBIN="$out/bin"
@@ -43,6 +41,30 @@ stdenv.mkDerivation {
     cd ./src
     ./all.bash
     cd -
+
+    # Handle Libraries and make them availabale under /share/go.
+    export GOLIB="pkg/"$GOOS"_"$GOARCH
+    ensureDir "$out/lib/go/$GOLIB"
+    cp -r ./$GOLIB $out/lib/go/pkg/
+
+    # this line set $AS $CC $GC $LD
+    source ./src/Make.$GOARCH
+
+    # Wrap the compiler and the linker to define the location of the
+    # libraries.
+    wrapProgram "$out/bin/$GC" \
+      --add-flags "-I" \
+      --add-flags "$out/lib/go/$GOLIB"
+
+    wrapProgram "$out/bin/$LD" \
+      --set "GOROOT" "$out/lib/go/" \
+      --set "GOOS" "$GOOS" \
+      --set "GOARCH" "$GOARCH"
+
+    # Copy the emacs configuration for Go files.
+    ensureDir "$out/share/emacs/site-lisp"
+    cp ./misc/emacs/* $out/share/emacs/site-lisp/ # */
+
   '';
 
   meta = {