From efad35892a29939a57925e362eeb8314de204dfc Mon Sep 17 00:00:00 2001 From: 2kybe3 Date: Fri, 17 Apr 2026 15:17:09 +0200 Subject: [PATCH] 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. --- pkgs/by-name/pa/parted/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/pa/parted/package.nix b/pkgs/by-name/pa/parted/package.nix index 97c63b66c930..9521843fd95b 100644 --- a/pkgs/by-name/pa/parted/package.nix +++ b/pkgs/by-name/pa/parted/package.nix @@ -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