diff options
| author | Lluis Batlle <viriketo@gmail.com> | 2013-03-19 11:46:47 +0100 |
|---|---|---|
| committer | Lluis Batlle <viriketo@gmail.com> | 2013-03-19 11:48:12 +0100 |
| commit | 61f9b4f61b3e98303792dcaf403d011b7c1a31f6 (patch) | |
| tree | 4a13c4d1f79aaad3d16b9ad262d7ad14bc8e6a26 /pkgs/development/compilers | |
| parent | 2d2123b8d7085e0db9e27eae81480323ac4acdd7 (diff) | |
| download | nixlib-61f9b4f61b3e98303792dcaf403d011b7c1a31f6.tar nixlib-61f9b4f61b3e98303792dcaf403d011b7c1a31f6.tar.gz nixlib-61f9b4f61b3e98303792dcaf403d011b7c1a31f6.tar.bz2 nixlib-61f9b4f61b3e98303792dcaf403d011b7c1a31f6.tar.lz nixlib-61f9b4f61b3e98303792dcaf403d011b7c1a31f6.tar.xz nixlib-61f9b4f61b3e98303792dcaf403d011b7c1a31f6.tar.zst nixlib-61f9b4f61b3e98303792dcaf403d011b7c1a31f6.zip | |
Fixing the go timezones. glibc doesn't include the zoneinfo anymore.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/go/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 955daa0ad9fc..9e74643e161f 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper}: +{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}: let loader386 = "${glibc}/lib/ld-linux.so.2"; @@ -35,7 +35,7 @@ stdenv.mkDerivation { sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c - sed -i 's,/usr/share/zoneinfo/,${glibc}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ # -e 's,/bin/echo,${coreutils}/bin/echo,' \ |