From 914e93bb01bc709ed2330d4c11b57f60fbee6873 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 2 Nov 2008 15:53:55 +0000 Subject: [PATCH] merging builder.sh into klibc expression svn path=/nixpkgs/trunk/; revision=13172 --- pkgs/os-specific/linux/klibc/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 34883ad00420..024b1ffe9fa3 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -2,13 +2,22 @@ , version ? "1.5" , sha256 ? "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017" , subdir ? "" + , addPreBuild ? "" }: assert stdenv.isLinux; stdenv.mkDerivation { name = "klibc-${version}"; - builder = ./builder.sh; + #builder = ./builder.sh; + makeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; + preBuild = '' + makeFlags=$(eval "echo $makeFlags") + + mkdir -p linux/include + cp -prd $kernel/lib/modules/*/build/include/* linux/include/ + chmod -R u+w linux/include/ + '' + addPreBuild; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/${subdir}klibc-${version}.tar.bz2"; inherit sha256;