diff options
| author | Joaquim Pedro França Simão <osmano807@gmail.com> | 2016-04-23 01:08:06 +0000 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-05-05 21:27:54 +0100 |
| commit | 133dc10e5a4f1c09d3446b60086b557625a27bde (patch) | |
| tree | cf9a101e194dce34f06c28441ff74d4be251d74c | |
| parent | 0ecef73966d0f638b612789d81e4f32caf4496f2 (diff) | |
| download | nixpkgs-133dc10e5a4f1c09d3446b60086b557625a27bde.tar nixpkgs-133dc10e5a4f1c09d3446b60086b557625a27bde.tar.gz nixpkgs-133dc10e5a4f1c09d3446b60086b557625a27bde.tar.bz2 nixpkgs-133dc10e5a4f1c09d3446b60086b557625a27bde.tar.lz nixpkgs-133dc10e5a4f1c09d3446b60086b557625a27bde.tar.xz nixpkgs-133dc10e5a4f1c09d3446b60086b557625a27bde.tar.zst nixpkgs-133dc10e5a4f1c09d3446b60086b557625a27bde.zip | |
open-vm-tools: fixes host VMware errors
| -rw-r--r-- | nixos/modules/virtualisation/vmware-guest.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/open-vm-tools/default.nix | 10 |
2 files changed, 11 insertions, 1 deletions
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"; |