diff --git a/pkgs/os-specific/linux/e2fsprogs/default.nix b/pkgs/os-specific/linux/e2fsprogs/default.nix
index 72d9dee4132c..faf7e41e3354 100644
--- a/pkgs/os-specific/linux/e2fsprogs/default.nix
+++ b/pkgs/os-specific/linux/e2fsprogs/default.nix
@@ -1,19 +1,18 @@
{stdenv, fetchurl, gettext}:
stdenv.mkDerivation {
- name = "e2fsprogs-1.39";
+ name = "e2fsprogs-1.40.7";
src = fetchurl {
- url = mirror://sourceforge/e2fsprogs/e2fsprogs-1.39.tar.gz;
- md5 = "06f7806782e357797fad1d34b7ced0c6";
+ url = mirror://sourceforge/e2fsprogs/e2fsprogs-1.40.7.tar.gz;
+ sha256 = "019czxrdz7f2nlcx4n9rb4cmjia7n038lhgnpamqdclxf0imfxjr";
};
configureFlags =
if stdenv ? isDietLibC
then ""
- else "--enable-dynamic-e2fsck --enable-elf-shlibs";
- buildInputs = [gettext];
- patches = [./e2fsprogs-1.39_etc.patch];
+ else "--enable-elf-shlibs";
+ #buildInputs = [gettext];
preInstall = "installFlagsArray=('LN=ln -s')";
- postInstall = "make install-libs";
+ #postInstall = "make install-libs";
NIX_CFLAGS_COMPILE =
if stdenv ? isDietLibC then
"-UHAVE_SYS_PRCTL_H " +
diff --git a/pkgs/os-specific/linux/e2fsprogs/e2fsprogs-1.39_etc.patch b/pkgs/os-specific/linux/e2fsprogs/e2fsprogs-1.39_etc.patch
deleted file mode 100644
index 0fc5a90eed35..000000000000
--- a/pkgs/os-specific/linux/e2fsprogs/e2fsprogs-1.39_etc.patch
+++ /dev/null
@@ -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