qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: purge remaining calls to xen-slim

Browse Source 
Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
This commit is contained in:
Fernando Rodrigues 2024-10-05 21:55:32 +00:00
parent 251dc99c70
commit 1610ee03f1
No known key found for this signature in database
GPG Key ID: CC3AE2EA00000000
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/by-name/li/libvmi/package.nix
View File

@ -19,7 +19,7 @@
libkvmi, libkvmi,
xenSupport ? true, xenSupport ? true,
xen-slim, xen,
}: }:
let let
@ -58,7 +58,7 @@ stdenv.mkDerivation {
json_c json_c
libvirt libvirt
] ]
++ lib.optionals xenSupport [ xen-slim ] ++ lib.optionals xenSupport [ xen ]
++ lib.optionals (!legacyKVM) [ libkvmi ] ++ lib.optionals (!legacyKVM) [ libkvmi ]
++ lib.optionals withVMIFS [ fuse ]; ++ lib.optionals withVMIFS [ fuse ];
@ -71,7 +71,7 @@ stdenv.mkDerivation {
postFixup = lib.optionalString xenSupport '' postFixup = lib.optionalString xenSupport ''
libvmi="$lib/lib/libvmi.so.${libVersion}" libvmi="$lib/lib/libvmi.so.${libVersion}"
oldrpath=$(patchelf --print-rpath "$libvmi") oldrpath=$(patchelf --print-rpath "$libvmi")
patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen-slim ]}" "$libvmi" patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen ]}" "$libvmi"
''; '';
passthru = { passthru = {

6
pkgs/by-name/xe/xen-guest-agent/package.nix
View File

@ -4,7 +4,7 @@
rustPlatform, rustPlatform,
llvmPackages, llvmPackages,
pkg-config, pkg-config,
xen-slim, xen,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "xen-guest-agent"; pname = "xen-guest-agent";
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
pkg-config pkg-config
]; ];
buildInputs = [ xen-slim ]; buildInputs = [ xen ];
postInstall = postInstall =
# Install the sample systemd service. # Install the sample systemd service.
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
postFixup = postFixup =
# Add the Xen libraries in the runpath so the guest agent can find libxenstore. # Add the Xen libraries in the runpath so the guest agent can find libxenstore.
"patchelf $out/bin/xen-guest-agent --add-rpath ${xen-slim.out}/lib"; "patchelf $out/bin/xen-guest-agent --add-rpath ${xen}/lib";
meta = { meta = {
description = "Xen agent running in Linux/BSDs (POSIX) VMs"; description = "Xen agent running in Linux/BSDs (POSIX) VMs";

2
pkgs/top-level/python-packages.nix
View File

@ -17590,7 +17590,7 @@ self: super: with self; {
inherit (pkgs) graphviz; inherit (pkgs) graphviz;
}; };
xen = toPythonModule (pkgs.xen-slim.override { xen = toPythonModule (pkgs.xen.override {
python3Packages = self; python3Packages = self;
}); });