diff options
author | Eelco Dolstra | 2010-06-10 12:28:04 +0000 |
---|---|---|
committer | Eelco Dolstra | 2010-06-10 12:28:04 +0000 |
commit | 6dddd07402ecf3389a5986611af3ef05313cb8a0 (patch) | |
tree | 4d1b6a458e30c219b97fa58c9aa945c0e5742f7b /pkgs/os-specific | |
parent | 3e958eea239e9968ecfca3c890637a1633f0e37a (diff) |
* vmTools: don't use klibc anymore. Just use utillinux/bash/etc.
svn path=/nixpkgs/trunk/; revision=22209
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/klibc/1.5.nix | 34 | ||||
-rw-r--r-- | pkgs/os-specific/linux/klibc/builder.sh | 11 |
2 files changed, 0 insertions, 45 deletions
diff --git a/pkgs/os-specific/linux/klibc/1.5.nix b/pkgs/os-specific/linux/klibc/1.5.nix deleted file mode 100644 index 72b9c12698be..000000000000 --- a/pkgs/os-specific/linux/klibc/1.5.nix +++ /dev/null @@ -1,34 +0,0 @@ -{stdenv, fetchurl, perl, bison, mktemp, linuxHeaders}: - -assert stdenv.isLinux; - -let version = "1.5"; in - -stdenv.mkDerivation { - name = "klibc-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/libs/klibc/klibc-${version}.tar.bz2"; - sha256 = "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017"; - }; - - makeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; - - preBuild = '' - makeFlags=$(eval "echo $makeFlags") - - mkdir linux - cp -prsd ${linuxHeaders}/include linux/ - chmod -R u+w linux/include/ - ''; # */ - - # Install static binaries as well. - postInstall = '' - dir=$out/lib/klibc/bin.static - mkdir $dir - cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/ - cp usr/dash/sh $dir/ - ''; - - buildInputs = [perl bison mktemp]; -} diff --git a/pkgs/os-specific/linux/klibc/builder.sh b/pkgs/os-specific/linux/klibc/builder.sh deleted file mode 100644 index 4ae5a9d080b1..000000000000 --- a/pkgs/os-specific/linux/klibc/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -preBuild() { - mkdir -p linux/include - cp -prd $kernel/lib/modules/*/build/include/* linux/include/ - chmod -R u+w linux/include/ -} - -makeFlagsArray=(V=1 prefix=$out SHLIBDIR=$out/lib) - -genericBuild |