From a61a4bc4bc2e682209e4fbb3b88d6f18d71bdfb2 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Sat, 14 Nov 2009 23:39:46 +0000 Subject: [PATCH] * Fix TimeZone in The Go Programming Language. svn path=/nixpkgs/trunk/; revision=18349 --- pkgs/development/compilers/go/default.nix | 1 + .../compilers/go/disable-system-dependent-tests.patch | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 862e69fae015..7da02f121b3c 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { # only for 386 build # !!! substituteInPlace does not seems to be effective. sed -i 's,/lib/ld-linux.so.2,${glibc}/lib/ld-linux.so.2,' src/cmd/8l/asm.c + sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo.go ''; GOOS = "linux"; diff --git a/pkgs/development/compilers/go/disable-system-dependent-tests.patch b/pkgs/development/compilers/go/disable-system-dependent-tests.patch index 7d24b02a214f..550d1a4ac25b 100644 --- a/pkgs/development/compilers/go/disable-system-dependent-tests.patch +++ b/pkgs/development/compilers/go/disable-system-dependent-tests.patch @@ -1,7 +1,7 @@ diff -r b51fd2d6c160 src/pkg/Makefile --- a/src/pkg/Makefile Tue Nov 10 20:05:24 2009 -0800 +++ b/src/pkg/Makefile Sat Nov 14 19:42:42 2009 +0100 -@@ -100,16 +100,19 @@ +@@ -100,16 +100,18 @@ NOTEST=\ debug/proc\ @@ -17,7 +17,6 @@ diff -r b51fd2d6c160 src/pkg/Makefile runtime\ syscall\ testing/iotest\ -+ time\ TEST=\ $(filter-out $(NOTEST),$(DIRS))