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

* Use symlinks instead of hard links in e2fsprogs.

Browse Source 
* Merge e2fsprogs and e2fsprogs-diet.

svn path=/nixpkgs/trunk/; revision=7116
This commit is contained in:
Eelco Dolstra 2006-11-24 11:36:57 +00:00
parent 9485d4a320
commit 50f412047d
5 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
View File

@ -1,10 +0,0 @@
source $stdenv/setup
installPhase() {
make install
cd lib/uuid; make install
}
installPhase=installPhase
genericBuild

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

@ -1,11 +0,0 @@
{stdenv, fetchurl, gettext}:
stdenv.mkDerivation {
name = "e2fsprogs-1.36";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.36.tar.gz;
md5 = "1804ee96b76e5e7113fe3cecd6fe582b";
};
buildInputs = [gettext];
}

17
pkgs/os-specific/linux/e2fsprogs/builder.sh
View File

@ -1,17 +0,0 @@
source $stdenv/setup
installPhase() {
make install
# oh this is fugly and should actually be fixed in e2fsprogs
ensureDir $out/man/man3
make -C lib/blkid install
make -C lib/e2p install
make -C lib/et install
make -C lib/ext2fs install
make -C lib/ss install
make -C lib/uuid install
}
installPhase=installPhase
genericBuild

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

@ -2,14 +2,17 @@
stdenv.mkDerivation {
name = "e2fsprogs-1.39";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/e2fsprogs-1.39.tar.gz;
md5 = "06f7806782e357797fad1d34b7ced0c6";
};
configureFlags = "--enable-dynamic-e2fsck --enable-elf-shlibs";
configureFlags =
if stdenv ? isDietLibC
then ""
else "--enable-dynamic-e2fsck --enable-elf-shlibs";
buildInputs = [gettext];
patches = [./e2fsprogs-1.39_etc.patch];
preInstall = "installFlagsArray=('LN=ln -s')";
NIX_CFLAGS_COMPILE =
if stdenv ? isDietLibC then "-UHAVE_SYS_PRCTL_H" else "";
}

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

@ -2047,7 +2047,7 @@ rec {
inherit fetchurl stdenv gettext;
};
e2fsprogsDiet = import ../os-specific/linux/e2fsprogs-diet {
e2fsprogsDiet = import ../os-specific/linux/e2fsprogs {
inherit fetchurl gettext;
stdenv = useDietLibC stdenv;
};