diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2009-01-06 23:22:29 +0000 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2009-01-06 23:22:29 +0000 |
commit | ed11a2bbc8a21e2fc70eb2367b1ea6455c70f911 (patch) | |
tree | 577674bf0d5d80fda177611be1cdf5d5f0075e87 /pkgs/os-specific/linux/e2fsprogs/default.nix | |
parent | 7b6b14df31ccdb21f3210be2b6fbc241cedcb32f (diff) |
Build e2fsprogs at last
svn path=/nixpkgs/trunk/; revision=13719
Diffstat (limited to 'pkgs/os-specific/linux/e2fsprogs/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/e2fsprogs/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix index ce0c55bcb40f1..c116b74a8103f 100644 --- a/pkgs/os-specific/linux/e2fsprogs/default.nix +++ b/pkgs/os-specific/linux/e2fsprogs/default.nix @@ -10,8 +10,12 @@ stdenv.mkDerivation { configureFlags = if stdenv ? isDietLibC - then "" + then "--with-diet-libc" else "--enable-elf-shlibs"; + + preBuild = if stdenv ? isDietLibC then '' + sed -e 's/-lpthread//' -i Makefile */Makefile */*/Makefile + '' else ""; preInstall = "installFlagsArray=('LN=ln -s')"; @@ -21,6 +25,7 @@ stdenv.mkDerivation { if stdenv ? isDietLibC then "-UHAVE_SYS_PRCTL_H " + (if stdenv.system == "x86_64-linux" then "-DHAVE_LSEEK64_PROTOTYPE=1 -Dstat64=stat" else "") + + " -lcompat -lpthread " else ""; meta = { |