diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:14:57 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-12-27 18:14:57 +0000 |
| commit | 138c0ae751174ae6859589a9c9d517e45c14dc18 (patch) | |
| tree | f0d6067ca147457c552f2c113c5697dc99547163 /pkgs/development/libraries/glibc | |
| parent | f6d923febc594c7a1fc3295e01972b049569e292 (diff) | |
| download | nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.gz nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.bz2 nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.lz nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.xz nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.tar.zst nixlib-138c0ae751174ae6859589a9c9d517e45c14dc18.zip | |
* Merge the new generic builder.
* Removed substitute, it's part of the generic builder now. * stdenv-initial (Linux): use the real generic builder script. This does require that sed is in the path of the builder of the initial stdenv. svn path=/nixpkgs/trunk/; revision=7498
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/builder.sh | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh index c8dc3aa25a5d..f8726fd31d23 100644 --- a/pkgs/development/libraries/glibc/builder.sh +++ b/pkgs/development/libraries/glibc/builder.sh @@ -3,7 +3,6 @@ export NIX_NO_SELF_RPATH=1 export NIX_DONT_SET_RPATH=1 source $stdenv/setup -source $substitute # Explicitly tell glibc to use our pwd, not /bin/pwd. export PWD_P=$(type -tP pwd) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index d1b57e02c52f..086747e9dcc6 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -6,7 +6,6 @@ stdenv.mkDerivation { name = "glibc-2.5"; builder = ./builder.sh; - substitute = ../../../build-support/substitute/substitute.sh; src = fetchurl { url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2; |