Unverified Commit 1610ee03 authored by Fernando Rodrigues's avatar Fernando Rodrigues
Browse files

treewide: purge remaining calls to xen-slim 



Signed-off-by: default avatarFernando Rodrigues <alpha@sigmasquadron.net>
parent 251dc99c

pkgs/by-name/li/libvmi/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 = {

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

+3 −3
Original line number Diff line number Diff line
@@ -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";

pkgs/top-level/python-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -17590,7 +17590,7 @@ self: super: with self; { 
    inherit (pkgs) graphviz;

  };













  xen = toPythonModule (pkgs.xen-slim.override {













  xen = toPythonModule (pkgs.xen.override {















    python3Packages = self;















  });