diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-06-14 09:28:10 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-06-14 09:28:10 +0000 |
| commit | 86345919c2cbedb0c9e20bee5dc25e0c74eee5cb (patch) | |
| tree | 1ca1eac7f1d46ae10b1d52f677cf152b3a29758e /pkgs/os-specific/linux/klibc | |
| parent | bf11f132e01e00a72c0c748797bfe50fe214d0db (diff) | |
| parent | b88adf69c32b14cdac4689c815ad7fddf550eab6 (diff) | |
| download | nixpkgs-86345919c2cbedb0c9e20bee5dc25e0c74eee5cb.tar nixpkgs-86345919c2cbedb0c9e20bee5dc25e0c74eee5cb.tar.gz nixpkgs-86345919c2cbedb0c9e20bee5dc25e0c74eee5cb.tar.bz2 nixpkgs-86345919c2cbedb0c9e20bee5dc25e0c74eee5cb.tar.lz nixpkgs-86345919c2cbedb0c9e20bee5dc25e0c74eee5cb.tar.xz nixpkgs-86345919c2cbedb0c9e20bee5dc25e0c74eee5cb.tar.zst nixpkgs-86345919c2cbedb0c9e20bee5dc25e0c74eee5cb.zip | |
Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/1.5.nix | 34 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/klibc/builder.sh | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 2 |
3 files changed, 1 insertions, 46 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 72b9c12698b..00000000000 --- 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 4ae5a9d080b..00000000000 --- 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 diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 0a2747eb165..c3f5db58303 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { name = "klibc-${version}"; src = fetchurl { - url = "mirror://kernel/linux/libs/klibc/Testing/klibc-${version}.tar.bz2"; + url = "mirror://kernel/linux/libs/klibc/klibc-${version}.tar.bz2"; sha256 = "1x401wmjca6zkyikf9xz45b3wb1hnj0m2s9in1sg6xdhi3pk8lwb"; }; |