diff options
| -rw-r--r-- | modules/nixos/features/nvk/default.nix | 16 | ||||
| -rw-r--r-- | modules/nixos/features/nvk/mesa.nix | 12 |
2 files changed, 20 insertions, 8 deletions
diff --git a/modules/nixos/features/nvk/default.nix b/modules/nixos/features/nvk/default.nix index 1b9e730..9e641ec 100644 --- a/modules/nixos/features/nvk/default.nix +++ b/modules/nixos/features/nvk/default.nix @@ -18,12 +18,20 @@ in { system.replaceRuntimeDependencies = [ { - original = pkgs.mesa.out; - replacement = mesa.out; + original = pkgs.mesa; + replacement = mesa; } { - original = pkgs.pkgsi686Linux.mesa.out; - replacement = mesa32.out; + original = pkgs.mesa.drivers; + replacement = mesa.drivers; + } + { + original = pkgs.pkgsi686Linux.mesa; + replacement = mesa32; + } + { + original = pkgs.pkgsi686Linux.mesa.drivers; + replacement = mesa32.drivers; } ]; }; diff --git a/modules/nixos/features/nvk/mesa.nix b/modules/nixos/features/nvk/mesa.nix index a00bb56..fe036d7 100644 --- a/modules/nixos/features/nvk/mesa.nix +++ b/modules/nixos/features/nvk/mesa.nix @@ -136,13 +136,17 @@ ] else ["auto"]; }) - .overrideAttrs (new: old: { - version = "24.0.0-rc1"; + .overrideAttrs (_new: old: let + # for some reason this version string won't work with + # system.replaceRuntimeDependencies /shrug + actualVersion = "24.0.0-rc1"; + in { + version = "24.0.0"; src = pkgs.fetchurl { urls = [ - "https://archive.mesa3d.org/mesa-${new.version}.tar.xz" - "https://mesa.freedesktop.org/archive/mesa-${new.version}.tar.xz" + "https://archive.mesa3d.org/mesa-${actualVersion}.tar.xz" + "https://mesa.freedesktop.org/archive/mesa-${actualVersion}.tar.xz" ]; hash = "sha256-hvsZnrrNlztnUjgdbTnyOLg+V749aVeMOCQ1OkCujO4="; |