svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
parent cdece69773 668a505214
commit 313a029f16
45 changed files with 227 additions and 214 deletions
@@ -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";