dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Revert "libguestfs: remove unnecessary ? null from inputs"

Browse Source 
This reverts commit e3fb23dc8c.

"appliance" is not the name of a package that can be provided by
callPackage, but a parameter that has to be explicitly passed in.
It's therefore not correct to remove the default value for it — it
broke eval!
This commit is contained in:
Alyssa Ross 2022-11-29 13:05:11 +00:00 committed by Alyssa Ross
parent 5c3e0a2899
commit e8b8afb255
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libguestfs/default.nix
View File

@ -35,12 +35,13 @@
, perlPackages
, ocamlPackages
, libtirpc
, withAppliance ? true
, appliance
, appliance ? null
, javaSupport ? false
, jdk
}:
assert appliance == null || lib.isDerivation appliance;
stdenv.mkDerivation rec {
pname = "libguestfs";
version = "1.48.4";
@ -127,13 +128,13 @@ stdenv.mkDerivation rec {
done
'';
postFixup = lib.optionalString withAppliance ''
postFixup = lib.optionalString (appliance != null) ''
mkdir -p $out/{lib,lib64}
ln -s ${appliance} $out/lib64/guestfs
ln -s ${appliance} $out/lib/guestfs
'';
doInstallCheck = withAppliance;
doInstallCheck = appliance != null;
installCheckPhase = ''
runHook preInstallCheck
@ -160,6 +161,6 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ offline ];
platforms = platforms.linux;
# this is to avoid "output size exceeded"
hydraPlatforms = if withAppliance then appliance.meta.hydraPlatforms else platforms.linux;
hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux;
};
}