diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-19 11:16:24 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-19 11:16:24 +0000 |
| commit | 313a029f160e919a68e7c9705e631daf29d341b7 (patch) | |
| tree | 3291ae38e4ff296e14d1af6b935c443e31cf4469 /pkgs/os-specific/linux/klibc | |
| parent | cdece697738e65c95183ae248fd4ef2e9ed4b439 (diff) | |
| parent | 668a5052142eab0b67a54160c9d299db78a2ce5d (diff) | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index e1b8c0d283646..e1f347af23cbd 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,13 +1,4 @@ -{ - stdenv, - fetchurl, - perl, - bison, - mktemp, - linuxHeaders, - linuxHeadersCross, - kernel ? null -}: +{ stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross, kernel ? null }: assert stdenv.isLinux; @@ -17,7 +8,7 @@ let in stdenv.mkDerivation { - name = "klibc-${version}"; + name = "klibc-${version}${stdenv.lib.optionalString (kernel != null) "-${kernel.version}"}"; src = fetchurl { url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; |