From 1610ee03f11b8cb3955af1771331efd0574e010d Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 5 Oct 2024 21:55:32 +0000 Subject: [PATCH] treewide: purge remaining calls to xen-slim Signed-off-by: Fernando Rodrigues --- pkgs/by-name/li/libvmi/package.nix | 6 +++--- pkgs/by-name/xe/xen-guest-agent/package.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix index 4eb6f54ba336..a1f314497b7b 100644 --- a/pkgs/by-name/li/libvmi/package.nix +++ b/pkgs/by-name/li/libvmi/package.nix @@ -19,7 +19,7 @@ libkvmi, xenSupport ? true, - xen-slim, + xen, }: let @@ -58,7 +58,7 @@ stdenv.mkDerivation { json_c libvirt ] - ++ lib.optionals xenSupport [ xen-slim ] + ++ lib.optionals xenSupport [ xen ] ++ lib.optionals (!legacyKVM) [ libkvmi ] ++ lib.optionals withVMIFS [ fuse ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation { postFixup = lib.optionalString xenSupport '' libvmi="$lib/lib/libvmi.so.${libVersion}" oldrpath=$(patchelf --print-rpath "$libvmi") - patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen-slim ]}" "$libvmi" + patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen ]}" "$libvmi" ''; passthru = { diff --git a/pkgs/by-name/xe/xen-guest-agent/package.nix b/pkgs/by-name/xe/xen-guest-agent/package.nix index b0223a6311ed..09c42e570911 100644 --- a/pkgs/by-name/xe/xen-guest-agent/package.nix +++ b/pkgs/by-name/xe/xen-guest-agent/package.nix @@ -4,7 +4,7 @@ rustPlatform, llvmPackages, pkg-config, - xen-slim, + xen, }: rustPlatform.buildRustPackage rec { pname = "xen-guest-agent"; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { pkg-config ]; - buildInputs = [ xen-slim ]; + buildInputs = [ xen ]; postInstall = # Install the sample systemd service. @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { postFixup = # 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 = { description = "Xen agent running in Linux/BSDs (POSIX) VMs"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b7ed5e1154f..f7d6020211ec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17590,7 +17590,7 @@ self: super: with self; { inherit (pkgs) graphviz; }; - xen = toPythonModule (pkgs.xen-slim.override { + xen = toPythonModule (pkgs.xen.override { python3Packages = self; });