nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

linuxPackages.klibc: use linuxHeaders

Browse Source 
klibc was the only user of kernelHeaders; it should use the Linux API
headers, however.
This commit is contained in:
Joachim Fasting 2016-04-18 17:05:40 +02:00
parent 893186f4fd
commit 002f5e24b4
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/klibc/default.nix
View File

@ -1,16 +1,15 @@
{ stdenv, fetchurl, kernelHeaders, kernel, perl }: { stdenv, fetchurl, linuxHeaders, perl }:
let let
version = "2.0.4";
commonMakeFlags = [ commonMakeFlags = [
"prefix=$(out)" "prefix=$(out)"
"SHLIBDIR=$(out)/lib" "SHLIBDIR=$(out)/lib"
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "klibc-${version}-${kernel.version}"; name = "klibc-${version}";
version = "2.0.4";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz";
@ -23,13 +22,13 @@ stdenv.mkDerivation {
makeFlags = commonMakeFlags ++ [ makeFlags = commonMakeFlags ++ [
"KLIBCARCH=${stdenv.platform.kernelArch}" "KLIBCARCH=${stdenv.platform.kernelArch}"
"KLIBCKERNELSRC=${kernelHeaders}" "KLIBCKERNELSRC=${linuxHeaders}"
] ++ stdenv.lib.optional (stdenv.platform.kernelArch == "arm") "CONFIG_AEABI=y"; ] ++ stdenv.lib.optional (stdenv.platform.kernelArch == "arm") "CONFIG_AEABI=y";
crossAttrs = { crossAttrs = {
makeFlags = commonMakeFlags ++ [ makeFlags = commonMakeFlags ++ [
"KLIBCARCH=${stdenv.cross.platform.kernelArch}" "KLIBCARCH=${stdenv.cross.platform.kernelArch}"
"KLIBCKERNELSRC=${kernelHeaders.crossDrv}" "KLIBCKERNELSRC=${linuxHeaders.crossDrv}"
"CROSS_COMPILE=${stdenv.cross.config}-" "CROSS_COMPILE=${stdenv.cross.config}-"
] ++ stdenv.lib.optional (stdenv.cross.platform.kernelArch == "arm") "CONFIG_AEABI=y"; ] ++ stdenv.lib.optional (stdenv.cross.platform.kernelArch == "arm") "CONFIG_AEABI=y";
}; };
@ -41,7 +40,7 @@ stdenv.mkDerivation {
cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/ cp $(find $(find . -name static) -type f ! -name "*.g" -a ! -name ".*") $dir/
cp usr/dash/sh $dir/ cp usr/dash/sh $dir/
for file in ${kernelHeaders}/include/*; do for file in ${linuxHeaders}/include/*; do
ln -sv $file $out/lib/klibc/include ln -sv $file $out/lib/klibc/include
done done
''; '';