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:
Vladimír Čunát
2015-04-26 19:54:51 +02:00
parent b7c3c25218
commit 3b9ef2c71b
81 changed files with 156 additions and 156 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 {