diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-17 14:32:28 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-17 14:32:28 +0000 |
| commit | b23126fcc3bca0072f68b576178aee263182ba71 (patch) | |
| tree | 70cb6062c9353474867b15d624da5ae7431ee77e /pkgs/os-specific/linux/klibc | |
| parent | d27f8787f7a30a96a10f6129482b32dad818e7ae (diff) | |
| download | nixpkgs-b23126fcc3bca0072f68b576178aee263182ba71.tar nixpkgs-b23126fcc3bca0072f68b576178aee263182ba71.tar.gz nixpkgs-b23126fcc3bca0072f68b576178aee263182ba71.tar.bz2 nixpkgs-b23126fcc3bca0072f68b576178aee263182ba71.tar.lz nixpkgs-b23126fcc3bca0072f68b576178aee263182ba71.tar.xz nixpkgs-b23126fcc3bca0072f68b576178aee263182ba71.tar.zst nixpkgs-b23126fcc3bca0072f68b576178aee263182ba71.zip | |
* Include the kernel version in kernel-specific packages so that they
can be distinguished in nix-env -qa output. svn path=/nixpkgs/trunk/; revision=32352
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 e1b8c0d2836..e1f347af23c 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"; |