diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 20:57:15 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:48 +0200 |
commit | 80ebb879cd32e5a0ca8f5321a494bbea9612be1a (patch) | |
tree | b022c50e38ca719c5e239d8eed855bcd32167d5a /pkgs/tools/filesystems/e2fsprogs/default.nix | |
parent | 98a4eabd99782484a3df73554bccc4a36af80bb4 (diff) | |
download | nixlib-80ebb879cd32e5a0ca8f5321a494bbea9612be1a.tar nixlib-80ebb879cd32e5a0ca8f5321a494bbea9612be1a.tar.gz nixlib-80ebb879cd32e5a0ca8f5321a494bbea9612be1a.tar.bz2 nixlib-80ebb879cd32e5a0ca8f5321a494bbea9612be1a.tar.lz nixlib-80ebb879cd32e5a0ca8f5321a494bbea9612be1a.tar.xz nixlib-80ebb879cd32e5a0ca8f5321a494bbea9612be1a.tar.zst nixlib-80ebb879cd32e5a0ca8f5321a494bbea9612be1a.zip |
Revert "e2fsprogs: 1.14.12 -> 1.14.13"
This reverts commit 3f4f90b58ba4d09352111c98a3e99019673ff64f.
Diffstat (limited to 'pkgs/tools/filesystems/e2fsprogs/default.nix')
-rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 66 |
1 files changed, 17 insertions, 49 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index c4b44b824f06..7617e82f1a8a 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,66 +1,34 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchurl, pkgconfig, libuuid }: -# Optional Dependencies -, libuuid -}: - -with stdenv; -let - optLibuuid = shouldUsePkg libuuid; -in -with stdenv.lib; stdenv.mkDerivation rec { - name = "e2fsprogs-1.42.13"; + name = "e2fsprogs-1.42.12"; src = fetchurl { url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz"; - sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; + sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ optLibuuid ]; + buildInputs = [ pkgconfig libuuid ]; + + crossAttrs = { + preConfigure = '' + export CC=$crossConfig-gcc + ''; + }; - configureFlags = [ - (mkEnable true "symlink-install" null) - (mkEnable true "relative-symlinks" null) - (mkEnable true "symlink-relative-symlinks" null) - (mkEnable false "compression" null) - (mkEnable true "htree" null) - (mkEnable true "elf-shlibs" null) - (mkEnable false "profile" null) - (mkEnable false "gcov" null) - (mkEnable false "jbd-debug" null) - (mkEnable false "blkid-debug" null) - (mkEnable false "testio-debug" null) - (mkEnable (optLibuuid == null) "libuuid" null) - (mkEnable (optLibuuid == null) "libblkid" null) - (mkEnable true "quota" null) - (mkEnable false "backtrace" null) - (mkEnable false "debugfs" null) - (mkEnable true "imager" null) - (mkEnable true "resizer" null) - (mkEnable true "defrag" null) - (mkEnable true "fsck" null) - (mkEnable false "e2initrd-helper" null) - (mkEnable true "tls" null) - (mkEnable false "uuidd" null) # Build is broken in 1.42.13 - ]; + # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency). + configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install"; enableParallelBuilding = true; - installFlags = [ - "LN=ln -s" - ]; + preInstall = "installFlagsArray=('LN=ln -s')"; - postInstall = '' - make install-libs - ''; + postInstall = "make install-libs"; - meta = with stdenv.lib; { + meta = { homepage = http://e2fsprogs.sourceforge.net/; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ eelco wkennington ]; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; }; } |