mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 02:46:38 +00:00
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
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")) {
|