From e37248668b483ea8076390df42b01b766a43a57f Mon Sep 17 00:00:00 2001 From: Jeremy Kolb Date: Sun, 29 May 2022 13:49:26 -0400 Subject: open-vm-tools: 12.0.0 -> 12.0.5 (#174744) * open-vm-tools: 12.0.0 -> 12.0.5 * remove unused fetchpatch --- .../virtualization/open-vm-tools/default.nix | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'pkgs/applications/virtualization/open-vm-tools') diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 6018608a3f163..79dad692e988e 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, autoreconfHook +{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook , bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.0.0"; + version = "12.0.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "sha256-agWTGf8x6bxZ7S5bU2scHt8IdLLe/hZdaEMfHIK9d8U="; + sha256 = "sha256-rjYYRh4ZWAd9iELW2/4PZvMOfQfgwtGcrI2icaed2Eg="; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -25,21 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 glib icu libdnet libdrm libmspack libtirpc openssl pam procps rpcsvc-proto udev xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - # glibc 2.35 and GCC 11 & 12 reporting possible array bounds overflow - # Will be fixed in the release after 12.0.0 - (fetchpatch { - url = "https://github.com/vmware/open-vm-tools/commit/de6d129476724668b8903e2a87654f50ba21b1b2.patch"; - sha256 = "1cqhm868g40kcp8qzzwq10zd4bah9ypaw1qawnli5d240mlkpfhh"; - }) - ]; - - prePatch = '' - cd .. - ''; - postPatch = '' - cd open-vm-tools 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 -- cgit 1.4.1