xen: enable strictDeps
Shuffles the input lists to ensure Xen works with `strictDeps` enabled. There are more derivations in `nativeBuildInputs` than strictly necessary for a successful build, but Xen calls for the OCaml and dev86 binaries during certain situations when building certain components. Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
This commit is contained in:
@@ -95,6 +95,7 @@ let
|
||||
inetutils
|
||||
iproute2
|
||||
iptables
|
||||
libnl.bin
|
||||
multipath-tools
|
||||
nbd
|
||||
openvswitch
|
||||
@@ -164,39 +165,42 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-v2DRJv+1bym8zAgU74lo1HQ/9rUcyK3qc4Eec4RpcEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
bison
|
||||
cmake
|
||||
flex
|
||||
pandoc
|
||||
pkg-config
|
||||
python3Packages.setuptools
|
||||
];
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
acpica-tools
|
||||
autoPatchelfHook
|
||||
bison
|
||||
cmake
|
||||
dev86
|
||||
flex
|
||||
pandoc
|
||||
perl
|
||||
pkg-config
|
||||
|
||||
# oxenstored
|
||||
ocamlPackages.findlib
|
||||
ocamlPackages.ocaml
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
python
|
||||
setuptools
|
||||
wrapPython
|
||||
]);
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
# Xen
|
||||
acpica-tools
|
||||
bzip2
|
||||
dev86
|
||||
e2fsprogs.dev
|
||||
libnl
|
||||
libuuid
|
||||
lzo
|
||||
ncurses
|
||||
perl
|
||||
python3Packages.python
|
||||
xz
|
||||
yajl
|
||||
zlib
|
||||
zstd
|
||||
|
||||
# oxenstored
|
||||
ocamlPackages.findlib
|
||||
ocamlPackages.ocaml
|
||||
|
||||
# Python Fixes
|
||||
python3Packages.wrapPython
|
||||
]
|
||||
++ optionals withFlask [ checkpolicy ]
|
||||
++ optionals (versionOlder finalAttrs.version "4.19") [ systemdMinimal ];
|
||||
|
||||
Reference in New Issue
Block a user