diff options
| author | Christian Mainka <Christian.Mainka@rub.de> | 2019-12-11 15:45:44 +0100 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-11 11:48:53 -0500 |
| commit | 316c4012e2706c86b1de73f4f788ba23142ad896 (patch) | |
| tree | 6d085e1f0b6d00601c78fca84f496beda7f9825b /pkgs/applications/virtualization/open-vm-tools | |
| parent | fabd3f506cc5d840cea41294a3ecb44ee03b9e1c (diff) | |
open-vm-tools: 10.3.10 -> 11.0.1
Also update our downstream patch.
Diffstat (limited to 'pkgs/applications/virtualization/open-vm-tools')
| -rw-r--r-- | pkgs/applications/virtualization/open-vm-tools/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch | 28 |
2 files changed, 17 insertions, 16 deletions
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index cf160d8af53e..8261ead38921 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 = "10.3.10"; + version = "11.0.1"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "0x2cyccnb4sycrw7r5mzby2d196f9jiph8vyqi0x8v8r2b4vi4yj"; + sha256 = "1p499ilb2j1s0d7qf19b8nig8ggdq7b60xcgb7bc18g8kp5g82lv"; }; sourceRoot = "${src.name}/open-vm-tools"; @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { mkdir -p common-agent/etc/config sed -i 's|.*common-agent/etc/config/Makefile.*|\\|' configure.ac + sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' Makefile.am sed -i 's,^confdir = ,confdir = ''${prefix},' 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 diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch index 46d8ea7f7f3f..95b0951b5853 100644 --- a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch +++ b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch @@ -1,8 +1,8 @@ -diff --git a/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h -index ef202e3..c7a105d 100644 +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 -@@ -238,6 +238,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); +@@ -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" @@ -10,19 +10,19 @@ index ef202e3..c7a105d 100644 #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/open-vm-tools/lib/misc/hostinfoPosix.c -index 0f55070..2d8467c 100644 +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 -@@ -195,6 +195,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"}, -@@ -554,6 +555,8 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name +@@ -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); |