From e3fb23dc8cf645ae47edbb34075da45be2212ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 27 Nov 2022 22:28:16 +0100 Subject: [PATCH] libguestfs: remove unnecessary ? null from inputs --- pkgs/development/libraries/libguestfs/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 745b1a180008..bf8750ffdd0e 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -35,13 +35,12 @@ , perlPackages , ocamlPackages , libtirpc -, appliance ? null +, withAppliance ? true +, appliance , javaSupport ? false , jdk }: -assert appliance == null || lib.isDerivation appliance; - stdenv.mkDerivation rec { pname = "libguestfs"; version = "1.48.4"; @@ -128,13 +127,13 @@ stdenv.mkDerivation rec { done ''; - postFixup = lib.optionalString (appliance != null) '' + postFixup = lib.optionalString withAppliance '' mkdir -p $out/{lib,lib64} ln -s ${appliance} $out/lib64/guestfs ln -s ${appliance} $out/lib/guestfs ''; - doInstallCheck = appliance != null; + doInstallCheck = withAppliance; installCheckPhase = '' runHook preInstallCheck @@ -161,6 +160,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ offline ]; platforms = platforms.linux; # this is to avoid "output size exceeded" - hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux; + hydraPlatforms = if withAppliance then appliance.meta.hydraPlatforms else platforms.linux; }; }