fix "libc}/lib" and similar references
Done mostly without any verification. I didn't bother with libc}/include, as the path is still correct.
This commit is contained in:
@@ -2,9 +2,9 @@
|
||||
, removeGodocExternals ? false }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
srcs = {
|
||||
golang = fetchurl {
|
||||
url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security }:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
srcs = {
|
||||
golang = fetchurl {
|
||||
url = https://github.com/golang/go/archive/go1.4.2.tar.gz;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
|
||||
|
||||
let
|
||||
loader386 = "${glibc}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc}/lib/ld-linux.so.3";
|
||||
loader386 = "${glibc.out}/lib/ld-linux.so.2";
|
||||
loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
|
||||
loaderArm = "${glibc.out}/lib/ld-linux.so.3";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
Reference in New Issue
Block a user