From 4d14edd8a53389b2583a00da1484bec4408d9207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tristan=20Dani=C3=ABl=20Maat?= <tm@tlater.net>
Date: Wed, 23 Aug 2023 02:23:00 +0200
Subject: [PATCH] nix module: Fix attempted workaround for option name change

`system.stateVersion` is about *system state*, i.e., stuff that was
created by old software versions on users' machines, like SQL
databases that have moved to a different directory or such.

It will not help figure out whether an option has been renamed.
---
 nix/module.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nix/module.nix b/nix/module.nix
index 2dd173c3..98789d15 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -2,6 +2,7 @@ inputs: {
   config,
   lib,
   pkgs,
+  options,
   ...
 }:
 with lib; let
@@ -62,10 +63,11 @@ in {
   config = mkIf cfg.enable {
     environment.systemPackages = [cfg.finalPackage];
 
-    fonts =
-      if versionOlder config.system.stateVersion "23.11"
-      then {enableDefaultFonts = mkDefault true;}
-      else {enableDefaultPackages = mkDefault true;};
+    # NixOS changed the name of this attribute between NixOS 23.05 and
+    # 23.11
+    fonts = if builtins.hasAttr "enableDefaultPackages" options.fonts
+      then {enableDefaultPackages = mkDefault true;}
+      else {enableDefaultFonts = mkDefault true;};
 
     hardware.opengl.enable = mkDefault true;