mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 06:14:26 +03:00
Fixing the go timezones. glibc doesn't include the zoneinfo anymore.
This commit is contained in:
parent
2d2123b8d7
commit
61f9b4f61b
@ -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,' \
|
||||
|
Loading…
Reference in New Issue
Block a user