From 133dc10e5a4f1c09d3446b60086b557625a27bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joaquim=20Pedro=20Fran=C3=A7a=20Sim=C3=A3o?= Date: Sat, 23 Apr 2016 01:08:06 +0000 Subject: [PATCH] open-vm-tools: fixes host VMware errors --- nixos/modules/virtualisation/vmware-guest.nix | 2 ++ .../virtualization/open-vm-tools/default.nix | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index ac2415a22b5..b9a4f3b11dc 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -25,6 +25,8 @@ in serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; }; + environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*"; + services.xserver = { videoDrivers = mkOverride 50 [ "vmware" ]; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 04ebc63be69..f5e0441ea6c 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, libmspack, openssl, pam, xercesc, icu, libdnet, procps, xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gtk, gtkmm }: + pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd }: let majorVersion = "10.0"; @@ -33,6 +33,14 @@ in stdenv.mkDerivation rec { configureFlags = "--without-kernel-modules --without-xmlsecurity"; + postInstall = '' + sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network" + wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ + --prefix PATH ':' "${iproute}/bin" \ + --prefix PATH ':' "${dbus}/bin" \ + --prefix PATH ':' "${systemd}/bin" + ''; + meta = with stdenv.lib; { homepage = "https://github.com/vmware/open-vm-tools"; description = "Set of tools for VMWare guests to improve host-guest interaction";