diff --git a/pkgs/development/uclibc/builder.sh b/pkgs/development/uclibc/builder.sh new file mode 100644 index 00000000000..d4b5cdf0738 --- /dev/null +++ b/pkgs/development/uclibc/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +preBuild=preBuild + +preBuild() { + cp $config .config +} + +genericBuild diff --git a/pkgs/development/uclibc/config b/pkgs/development/uclibc/config index 8ac84c3e884..0a86a01c117 100644 --- a/pkgs/development/uclibc/config +++ b/pkgs/development/uclibc/config @@ -47,7 +47,8 @@ ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y HAS_FPU=y # DO_C99_MATH is not set -KERNEL_SOURCE="/usr/src/linux" +#KERNEL_SOURCE="/usr/src/linux" +KERNEL_SOURCE="$(kernelHeadersArm)" C_SYMBOL_PREFIX="" HAVE_DOT_CONFIG=y diff --git a/pkgs/development/uclibc/default.nix b/pkgs/development/uclibc/default.nix index 392282f31e0..c1da407c99d 100644 --- a/pkgs/development/uclibc/default.nix +++ b/pkgs/development/uclibc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, gcc40arm, kernelHeadersArm, binutilsArm}: stdenv.mkDerivation { builder = ./builder.sh; @@ -8,4 +8,7 @@ stdenv.mkDerivation { md5 = "1ada58d919a82561061e4741fb6abd29"; }; config = ./config; + inherit kernelHeadersArm; + buildInputs = [gcc40arm binutilsArm]; + makeFlags="CROSS=arm-linux-"; }