Merge pull request #61872 from transumption/201905/fix-e2fsprogs-cross

e2fsprogs: fix cross compilation
This commit is contained in:
Yegor Timoshenko 2019-05-26 10:30:09 +03:00 committed by GitHub
commit e775638efd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,9 +27,15 @@ stdenv.mkDerivation rec {
configureFlags =
if stdenv.isLinux then [
"--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"
# libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
"--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck"
"--enable-elf-shlibs"
"--enable-symlink-install"
"--enable-relative-symlinks"
"--with-crond-dir=no"
# fsck, libblkid, libuuid and uuidd are in util-linux-ng (the "libuuid" dependency)
"--disable-fsck"
"--disable-libblkid"
"--disable-libuuid"
"--disable-uuidd"
] else [
"--enable-libuuid --disable-e2initrd-helper"
];