ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

* e2fsprogs 1.40.7.

Browse Source 
svn path=/nixpkgs/trunk/; revision=10981
This commit is contained in:
Eelco Dolstra 2008-03-06 12:08:19 +00:00
parent f210ada337
commit 282c8421d5
2 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,19 +1,18 @@
{stdenv, fetchurl, gettext}: {stdenv, fetchurl, gettext}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "e2fsprogs-1.39"; name = "e2fsprogs-1.40.7";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/e2fsprogs/e2fsprogs-1.39.tar.gz; url = mirror://sourceforge/e2fsprogs/e2fsprogs-1.40.7.tar.gz;
md5 = "06f7806782e357797fad1d34b7ced0c6"; sha256 = "019czxrdz7f2nlcx4n9rb4cmjia7n038lhgnpamqdclxf0imfxjr";
}; };
configureFlags = configureFlags =
if stdenv ? isDietLibC if stdenv ? isDietLibC
then "" then ""
else "--enable-dynamic-e2fsck --enable-elf-shlibs"; else "--enable-elf-shlibs";
buildInputs = [gettext]; #buildInputs = [gettext];
patches = [./e2fsprogs-1.39_etc.patch];
preInstall = "installFlagsArray=('LN=ln -s')"; preInstall = "installFlagsArray=('LN=ln -s')";
postInstall = "make install-libs"; #postInstall = "make install-libs";
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE =
if stdenv ? isDietLibC then if stdenv ? isDietLibC then
"-UHAVE_SYS_PRCTL_H " + "-UHAVE_SYS_PRCTL_H " +

27
pkgs/os-specific/linux/e2fsprogs/e2fsprogs-1.39_etc.patch
View File

@ -1,27 +0,0 @@
diff -ruN e2fsprogs-1.39/misc/Makefile.in e2fsprogs-1.39.new/misc/Makefile.in
--- e2fsprogs-1.39/misc/Makefile.in 2006-03-27 07:58:10.000000000 +0200
+++ e2fsprogs-1.39.new/misc/Makefile.in 2006-06-24 17:53:48.000000000 +0200
@@ -223,12 +223,12 @@
@$(SUBSTITUTE_UPTIME) $(srcdir)/filefrag.8.in filefrag.8
installdirs:
- @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir)"
+ @echo " MKINSTALLDIRS $(sbindir) $(root_sbindir) $(bindir) $(man1dir) $(man8dir) $(libdir) $(root_sysconfdir)"
@$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) \
$(DESTDIR)$(root_sbindir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man8dir) \
$(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
- $(DESTDIR)$(libdir) $(DESTDIR)/etc
+ $(DESTDIR)$(libdir) $(DESTDIR)$(root_sysconfdir)/etc
install: all $(SMANPAGES) $(UMANPAGES) installdirs
@for i in $(SPROGS); do \
@@ -291,7 +291,7 @@
@if ! test -f $(DESTDIR)/etc/mke2fs.conf; then \
echo " INSTALL_DATA /etc/mke2fs.conf"; \
$(INSTALL_DATA) $(srcdir)/mke2fs.conf \
- $(DESTDIR)/etc/mke2fs.conf; \
+ $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; \
fi
install-strip: install