diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-02-21 16:03:34 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-02-21 16:03:34 +0000 |
commit | e6744d0f893e0641b22996382cc6dcb81f8acc3d (patch) | |
tree | ba656c68d6348d24c4814a6da79bb204e06ff2d7 /pkgs/os-specific/linux/net-tools/default.nix | |
parent | cdaecff49f9b06d74de87e217659c13b2b2bba98 (diff) | |
parent | 8125cd8915a1601280327503ce3ac14e0a356771 (diff) | |
download | nixpkgs-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar nixpkgs-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.gz nixpkgs-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.bz2 nixpkgs-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.lz nixpkgs-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.xz nixpkgs-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.zst nixpkgs-e6744d0f893e0641b22996382cc6dcb81f8acc3d.zip |
* Merge diff between trunk/pkgs@1646 and branches/nixos-pkgs@2256;
this contains mostly Armijn's pure stdenv-linux. * After unpacking the statically linked GCC, patch all store paths to /nix/store/ffffffffffffffffffffffffffffffff. Ugly hack to prevent undeclared references but it works. * We don't need Glib's dynamic libraries in the first bootstrap stage; delete them. Actually the downloaded Glibc binary is only needed for building Glibc, since GCC needs a C compiler to build some programs in `configure'. So static linking is fine for that. Maybe it would be better to patch `configure' so that we don't need a pre-built Glibc at all. * Set the svn:executable property on `cp' and `patchelf'. * In Glibc, revert to LinuxThreads. Maybe NPTL will work, but TLS support is a problem. * Delete most Glibc patches; they're no longer needed since the branch updated it to 20050110. * Some cleanups. svn path=/nixpkgs/trunk/; revision=2258
Diffstat (limited to 'pkgs/os-specific/linux/net-tools/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/net-tools/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 3fb269943fc..240e9b57152 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -8,4 +8,5 @@ stdenv.mkDerivation { md5 = "888774accab40217dde927e21979c165"; }; config = ./config.h; + patch = ./net-tools-labels.patch; } |