summary refs log tree commit diff
path: root/pkgs/applications/virtualization/open-vm-tools/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/virtualization/open-vm-tools/default.nix')
-rw-r--r--pkgs/applications/virtualization/open-vm-tools/default.nix33
1 files changed, 22 insertions, 11 deletions
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 1cd33e8b97a..f5e0441ea6c 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, lib, fetchurl, makeWrapper, autoreconfHook,
+{ 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 = "9.10";
-  minorVersion = "0";
-  patchSet = "2476743";
-  version = "${majorVersion}.${minorVersion}-${patchSet}";
+  majorVersion = "10.0";
+  minorVersion = "7";
+  version = "${majorVersion}.${minorVersion}";
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "open-vm-tools-${version}";
-  src = fetchurl {
-    url = "mirror://sourceforge/project/open-vm-tools/open-vm-tools/stable-${majorVersion}.x/open-vm-tools-${version}.tar.gz";
-    sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1";
+  src = fetchFromGitHub {
+    owner = "vmware";
+    repo = "open-vm-tools";
+    rev = "stable-${version}";
+    sha256 = "0xxgppxjisg3jly21r7mjk06rc4n7ssyvapasxhbi2d1bw0xkvrj";
   };
 
+  sourceRoot = "${src.name}/open-vm-tools";
+
   buildInputs =
     [ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps
       pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
 
-  patchPhase = ''
+  postPatch = ''
      sed -i s,-Werror,,g configure.ac
      sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am
      sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
@@ -30,6 +33,14 @@ in stdenv.mkDerivation {
 
   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";