diff options
| author | Christian Mainka <Christian.Mainka@rub.de> | 2020-11-11 15:51:41 +0100 |
|---|---|---|
| committer | Christian Mainka <Christian.Mainka@rub.de> | 2020-11-11 16:22:41 +0100 |
| commit | 44e2d0d402f7faa0601fb675f0fd1817eeb28b79 (patch) | |
| tree | 03c7f78dc60b8b8bddc7b943b140e0714ca2b9c6 /pkgs | |
| parent | 999e24d2472213a76e549beb9a823fe380b70483 (diff) | |
| download | nixpkgs-44e2d0d402f7faa0601fb675f0fd1817eeb28b79.tar nixpkgs-44e2d0d402f7faa0601fb675f0fd1817eeb28b79.tar.gz nixpkgs-44e2d0d402f7faa0601fb675f0fd1817eeb28b79.tar.bz2 nixpkgs-44e2d0d402f7faa0601fb675f0fd1817eeb28b79.tar.lz nixpkgs-44e2d0d402f7faa0601fb675f0fd1817eeb28b79.tar.xz nixpkgs-44e2d0d402f7faa0601fb675f0fd1817eeb28b79.tar.zst nixpkgs-44e2d0d402f7faa0601fb675f0fd1817eeb28b79.zip | |
open-vm-tools: 11.1.5 -> 11.2.0
Diffstat (limited to 'pkgs')
3 files changed, 2 insertions, 52 deletions
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 033fe79368b..4cdce2172a2 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.1.5"; + version = "11.2.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "0i8p28hd5wgiay4lgmd9fid5ickwygy6w3xpfzzy8v9z04xc5bg7"; + sha256 = "125y3zdhj353dmmjmssdaib2zp1jg5aiqmvpgkrzhnh5nx2icfv6"; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -23,11 +23,6 @@ stdenv.mkDerivation rec { buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; - patches = [ - ./recognize_nixos.patch - ./find_gdk_pixbuf_xlib.patch #See https://github.com/vmware/open-vm-tools/pull/438 - ]; - postPatch = '' # Build bugfix for 10.1.0, stolen from Arch PKGBUILD mkdir -p common-agent/etc/config diff --git a/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch b/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch deleted file mode 100644 index 6606c50e77d..00000000000 --- a/pkgs/applications/virtualization/open-vm-tools/find_gdk_pixbuf_xlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/appUtil/Makefile.am b/lib/appUtil/Makefile.am -index a0d8e391..899cd4e9 100644 ---- a/lib/appUtil/Makefile.am -+++ b/lib/appUtil/Makefile.am -@@ -21,4 +21,6 @@ libAppUtil_la_SOURCES = - libAppUtil_la_SOURCES += appUtil.c - libAppUtil_la_SOURCES += appUtilX11.c - --AM_CFLAGS = @GTK_CPPFLAGS@ -+AM_CFLAGS = -+AM_CFLAGS += @GTK_CPPFLAGS@ -+AM_CFLAGS += @GDK_PIXBUF_XLIB2_CPPFLAGS@ diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch deleted file mode 100644 index 95b0951b585..00000000000 --- a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/include/guest_os.h b/lib/include/guest_os.h -index 868dec68..0b9a2ad7 100644 ---- a/lib/include/guest_os.h -+++ b/lib/include/guest_os.h -@@ -278,6 +278,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); - #define STR_OS_MANDRAKE_FULL "Mandrake Linux" - #define STR_OS_MANDRIVA "mandriva" - #define STR_OS_MKLINUX "MkLinux" -+#define STR_OS_NIXOS "NixOS" - #define STR_OS_NOVELL "nld9" - #define STR_OS_NOVELL_FULL "Novell Linux Desktop 9" - #define STR_OS_ORACLE6 "oraclelinux6" -diff --git a/lib/misc/hostinfoPosix.c b/lib/misc/hostinfoPosix.c -index 348a67ec..5f8beb2b 100644 ---- a/lib/misc/hostinfoPosix.c -+++ b/lib/misc/hostinfoPosix.c -@@ -203,6 +203,7 @@ static const DistroInfo distroArray[] = { - { "Mandrake", "/etc/mandrake-release" }, - { "Mandriva", "/etc/mandriva-release" }, - { "MkLinux", "/etc/mklinux-release" }, -+ { "NixOS", "/etc/os-release" }, - { "Novell", "/etc/nld-release" }, - { "OracleLinux", "/etc/oracle-release" }, - { "Photon", "/etc/lsb-release" }, -@@ -865,6 +866,8 @@ HostinfoGetOSShortName(const char *distro, // IN: full distro name - } - } else if (strstr(distroLower, "mandrake")) { - Str_Strcpy(distroShort, STR_OS_MANDRAKE, distroShortSize); -+ } else if (strstr(distroLower, "nixos")) { -+ Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize); - } else if (strstr(distroLower, "turbolinux")) { - Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize); - } else if (strstr(distroLower, "sun")) { |