public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build e2fsprogs at last 

svn path=/nixpkgs/trunk/; revision=13719
This commit is contained in:
Michael Raskin 2009-01-06 23:22:29 +00:00
parent 7b6b14df31
commit ed11a2bbc8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/linux/e2fsprogs/default.nix
View File

@ -10,8 +10,12 @@ stdenv.mkDerivation {
configureFlags = configureFlags =
if stdenv ? isDietLibC if stdenv ? isDietLibC
then "" then "--with-diet-libc"
else "--enable-elf-shlibs"; else "--enable-elf-shlibs";
preBuild = if stdenv ? isDietLibC then ''
sed -e 's/-lpthread//' -i Makefile */Makefile */*/Makefile
'' else "";
preInstall = "installFlagsArray=('LN=ln -s')"; preInstall = "installFlagsArray=('LN=ln -s')";
@ -21,6 +25,7 @@ stdenv.mkDerivation {
if stdenv ? isDietLibC then if stdenv ? isDietLibC then
"-UHAVE_SYS_PRCTL_H " + "-UHAVE_SYS_PRCTL_H " +
(if stdenv.system == "x86_64-linux" then "-DHAVE_LSEEK64_PROTOTYPE=1 -Dstat64=stat" else "") (if stdenv.system == "x86_64-linux" then "-DHAVE_LSEEK64_PROTOTYPE=1 -Dstat64=stat" else "")
+ " -lcompat -lpthread "
else ""; else "";
meta = { meta = {

4
pkgs/top-level/all-packages.nix
View File

@ -6702,6 +6702,10 @@ let
inherit fetchurl stdenv e2fsprogs; inherit fetchurl stdenv e2fsprogs;
}; };
utillinuxngCurses = composedArgsAndFun (import ../os-specific/linux/util-linux-ng) {
inherit fetchurl stdenv e2fsprogs ncurses;
};
wesnoth = import ../games/wesnoth { wesnoth = import ../games/wesnoth {
inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net gettext zlib boost freetype; inherit fetchurl stdenv SDL SDL_image SDL_mixer SDL_net gettext zlib boost freetype;
}; };