From 5bba455bed3b5cf9fda60d00fd2a351fef85e064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 10 Oct 2024 15:26:57 +0200
Subject: [PATCH] restore compatibility with 24.05

addresses
https://github.com/numtide/nixos-facter-modules/issues/40#issuecomment-2405049896
---
 modules/nixos/24.05-compat.nix | 15 +++++++++++++++
 modules/nixos/facter.nix       |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 modules/nixos/24.05-compat.nix

diff --git a/modules/nixos/24.05-compat.nix b/modules/nixos/24.05-compat.nix
new file mode 100644
index 0000000..1750888
--- /dev/null
+++ b/modules/nixos/24.05-compat.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  ...
+}:
+{
+  # Backward-compat for 24.05, can be removed after we drop 24.05 support
+  imports = lib.optionals (lib.versionOlder lib.version "24.11pre") [
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "enable" ] [ "hardware" "opengl" "enable" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "extraPackages" ] [ "hardware" "opengl" "extraPackages" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "extraPackages32" ] [ "hardware" "opengl" "extraPackages32" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "enable32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "package" ] [ "hardware" "opengl" "package" ])
+    (lib.mkAliasOptionModule [ "hardware" "graphics" "package32" ] [ "hardware" "opengl" "package32" ])
+  ];
+}
diff --git a/modules/nixos/facter.nix b/modules/nixos/facter.nix
index 6cd6128..cf61213 100644
--- a/modules/nixos/facter.nix
+++ b/modules/nixos/facter.nix
@@ -13,6 +13,7 @@
     ./networking
     ./system.nix
     ./virtualisation.nix
+    ./24.05-compat.nix
   ];
 
   options.facter = with lib; {