summary refs log tree commit diff
path: root/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch')
-rw-r--r--pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch28
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch
index 46d8ea7f7f3..95b0951b585 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);