parted: cleanup
phase out `pkg != null` `--with-readline` is enabled by [default](https://cgit.git.savannah.gnu.org/cgit/parted.git/tree/configure.ac#n70) so no need to set it explicitly.
This commit is contained in:
@@ -38,23 +38,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
libuuid
|
||||
]
|
||||
++ lib.optional (readline != null) readline
|
||||
++ lib.optional (gettext != null) gettext
|
||||
++ lib.optional (lvm2 != null) lvm2;
|
||||
readline
|
||||
gettext
|
||||
lvm2
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
configureFlags =
|
||||
(if (readline != null) then [ "--with-readline" ] else [ "--without-readline" ])
|
||||
++ lib.optional (lvm2 == null) "--disable-device-mapper"
|
||||
++ lib.optional enableStatic "--enable-static";
|
||||
configureFlags = lib.optional enableStatic "--enable-static";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Tests were previously failing due to Hydra running builds as uid 0.
|
||||
# That should hopefully be fixed now.
|
||||
doCheck = !stdenv.hostPlatform.isMusl; # translation test
|
||||
nativeCheckInputs = [
|
||||
check
|
||||
|
||||
Reference in New Issue
Block a user