nixos-unstable fixes

2024-10-30 23:18:53 +01:00
parent 60b890b566
commit d998fd13f9
4 changed files with 23 additions and 3 deletions
--- a/hardware/gpu/intel.nix
+++ b/hardware/gpu/intel.nix
@@ -1,4 +1,6 @@
 { config, pkgs, lib, ... }:
+lib.mkMerge [
+
 {
  # enable opengl (headless)

@@ -18,7 +20,11 @@
  };

  hardware.opengl.enable = true;
+}
+(lib.optionalAttrs (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") {
  hardware.opengl.driSupport = true;
+})
+{
  hardware.opengl.extraPackages = with pkgs; [
    mesa.drivers
    intel-media-driver
@@ -34,3 +40,4 @@
    (pkgs.nvtopPackages.intel or pkgs.nvtop-intel)
  ];
 }
+]