diff options
| author | Daniël de Kok <me@danieldk.eu> | 2020-07-15 14:18:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 14:18:26 +0200 |
| commit | 7cc06dce653e8907c495a7cd4cea48a20343622a (patch) | |
| tree | 2879f9aae49dd9ab4a61aec16973c1ac7f8fe9f1 /pkgs/applications/virtualization | |
| parent | 363110efadef0871d61cc2f78d2e59bfc764088b (diff) | |
| parent | 6c2f89d696aa2c87195430bd1f761451b9182e4a (diff) | |
Merge pull request #93126 from CheariX/open-vm-tools-11.1.0
open-vm-tools: 11.0.5 -> 11.1.0
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/open-vm-tools/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 46d91884fcd35..df9a89293f2c1 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.0.5"; + version = "11.1.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "0idh8dqwb1df2di689090k9x1iap35jk3wg8yb1g70byichmscqb"; + sha256 = "1wyiz8j5b22ajrr1fh9cn55lsgd5g13q0i8wvk2a0yw0vaw1883s"; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - ./recognize_nixos.patch + patches = [ + ./recognize_nixos.patch ./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438 ]; @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am + sed -i 's,usr/bin,''${prefix}/usr/bin,' scripts/Makefile.am sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am |