summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/nixos/features/nvk/default.nix68
-rw-r--r--modules/nixos/features/nvk/mesa.nix171
2 files changed, 186 insertions, 53 deletions
diff --git a/modules/nixos/features/nvk/default.nix b/modules/nixos/features/nvk/default.nix
index 68c92ff..1b9e730 100644
--- a/modules/nixos/features/nvk/default.nix
+++ b/modules/nixos/features/nvk/default.nix
@@ -5,64 +5,26 @@
...
}: let
cfg = config.features.nvk;
-
- mkMesa = pkgs:
- (pkgs.mesa.override {
- vulkanDrivers =
- if pkgs.stdenv.isLinux
- then
- [
- "amd" # AMD (aka RADV)
- "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen)
- "swrast" # software renderer (aka Lavapipe)
- "nouveau-experimental" # nvk
- ]
- ++ lib.optionals (pkgs.stdenv.hostPlatform.isAarch -> lib.versionAtLeast pkgs.stdenv.hostPlatform.parsed.cpu.version "6") [
- # QEMU virtualized GPU (aka VirGL)
- # Requires ATOMIC_INT_LOCK_FREE == 2.
- "virtio"
- ]
- ++ lib.optionals pkgs.stdenv.isAarch64 [
- "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D)
- "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
- "imagination-experimental" # PowerVR Rogue (currently N/A)
- "panfrost" # ARM Mali Midgard and up (T/G series)
- ]
- ++ lib.optionals pkgs.stdenv.hostPlatform.isx86 [
- "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build
- "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code)
- ]
- else ["auto"];
- })
- .overrideAttrs (new: old: let
- replacePatches = patch:
- {
- "opencl.patch" = ./opencl.patch;
- "disk_cache-include-dri-driver-path-in-cache-key.patch" = ./disk_cache-include-dri-driver-path-in-cache-key.patch;
- }
- .${baseNameOf patch}
- or patch;
- in {
- version = "23.3.1";
-
- src = pkgs.fetchurl {
- urls = [
- "https://archive.mesa3d.org/mesa-${new.version}.tar.xz"
- "https://mesa.freedesktop.org/archive/mesa-${new.version}.tar.xz"
- ];
-
- hash = "sha256-bkgSbXD9s/IP/rJGygwuQf/cg18GY6A9RSa4v120HeY=";
- };
-
- patches = map replacePatches old.patches;
- });
+ mesa = import ./mesa.nix pkgs;
+ mesa32 = import ./mesa.nix pkgs.pkgsi686Linux;
in {
options.features.nvk.enable = lib.mkEnableOption "nvk";
config = lib.mkIf cfg.enable {
hardware.opengl = {
- package = (mkMesa pkgs).drivers;
- package32 = (mkMesa pkgs.pkgsi686Linux).drivers;
+ package = mesa.drivers;
+ package32 = mesa32.drivers;
};
+
+ system.replaceRuntimeDependencies = [
+ {
+ original = pkgs.mesa.out;
+ replacement = mesa.out;
+ }
+ {
+ original = pkgs.pkgsi686Linux.mesa.out;
+ replacement = mesa32.out;
+ }
+ ];
};
}
diff --git a/modules/nixos/features/nvk/mesa.nix b/modules/nixos/features/nvk/mesa.nix
new file mode 100644
index 0000000..a00bb56
--- /dev/null
+++ b/modules/nixos/features/nvk/mesa.nix
@@ -0,0 +1,171 @@
+{
+ lib,
+ pkgs,
+ ...
+}: let
+ directx-headers = pkgs.directx-headers.overrideAttrs (new: _: {
+ version = "1.611.0";
+ src = pkgs.fetchFromGitHub {
+ owner = "microsoft";
+ repo = "DirectX-Headers";
+ rev = "v${new.version}";
+ hash = "sha256-HG2Zj8hvsgv8oeSDp1eK+1A5bvFL6oQIh5mMFWOFsvk=";
+ };
+ });
+
+ libdrm = pkgs.libdrm.overrideAttrs (new: _: {
+ version = "2.4.119";
+
+ src = pkgs.fetchFromGitLab {
+ domain = "gitlab.freedesktop.org";
+ owner = "mesa";
+ repo = "drm";
+ rev = "libdrm-${new.version}";
+ hash = "sha256-bIP3yK3VGZ/WGaUclJpb4nH8y6+zHQlQma+C9Or+Vg8=";
+ };
+ });
+
+ meson = pkgs.meson.overrideAttrs (new: old: let
+ badPatches = [
+ "https://github.com/mesonbuild/meson/commit/d5252c5d4cf1c1931fef0c1c98dd66c000891d21.patch"
+ ];
+ in {
+ version = "1.3.1";
+
+ src = pkgs.fetchFromGitHub {
+ owner = "mesonbuild";
+ repo = "meson";
+ rev = "refs/tags/${new.version}";
+ hash = "sha256-KNNtHi3jx0MRiOgmluA4ucZJWB2WeIYdApfHuspbCqg=";
+ };
+
+ patches = lib.filter (p: !(lib.attrsets.isDerivation p) || !(lib.elem (p.url or null) badPatches)) old.patches;
+ });
+
+ revert26943 = pkgs.fetchpatch {
+ url = "https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26943.diff";
+ hash = "sha256-KwIG68mf+aArMlvWBtGJdOFdCn5zTZJG6geWXE7bK44=";
+ revert = true;
+ };
+
+ revert24386_1 = pkgs.fetchpatch {
+ url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit//299f9497758ca5d7278e5aafd210aa91d20dfb4d.patch";
+ hash = "sha256-ugrkIqJ/Tndimn6YIQSanLVvQ5qZfp2m6GGStHLt8xg=";
+ revert = true;
+ };
+
+ revert24386_2 = pkgs.fetchpatch {
+ url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/1e5bc00715ad8acf3dc323278d0d6a24986bb4ae.patch";
+ hash = "sha256-i0+sBeU/c8Eo8WA34aJfMLJOxhd7146+t7H6llGwS+g=";
+ revert = true;
+ };
+
+ cargoDeps = {
+ proc-macro2 = {
+ version = "1.0.70";
+ hash = "sha256-OSePu/X7T2Rs5lFpCHf4nRxYEaPUrLJ3AMHLPNt4/Ts=";
+ };
+ quote = {
+ version = "1.0.33";
+ hash = "sha256-Umf8pElgKGKKlRYPxCOjPosuavilMCV54yLktSApPK4=";
+ };
+ syn = {
+ version = "2.0.39";
+ hash = "sha256-I+eLkPL89F0+hCAyzjLj8tFUW6ZjYnHcvyT6MG2Hvno=";
+ };
+ unicode-ident = {
+ version = "1.0.12";
+ hash = "sha256-M1S5rD+uH/Z1XLbbU2g622YWNPZ1V5Qt6k+s6+wP7ks=";
+ };
+ };
+
+ cargoFetch = crate:
+ pkgs.fetchurl {
+ url = "https://crates.io/api/v1/crates/${crate}/${cargoDeps.${crate}.version}/download";
+ inherit (cargoDeps.${crate}) hash;
+ };
+
+ cargoSubproject = crate: ''
+ ln -s ${cargoFetch crate} subprojects/packagecache/${crate}-${cargoDeps.${crate}.version}.tar.gz
+ '';
+
+ subprojects = lib.concatMapStringsSep "\n" cargoSubproject (lib.attrNames cargoDeps);
+
+ replacePatches = patch:
+ {
+ "opencl.patch" = ./opencl.patch;
+ "disk_cache-include-dri-driver-path-in-cache-key.patch" = ./disk_cache-include-dri-driver-path-in-cache-key.patch;
+ }
+ .${baseNameOf patch}
+ or patch;
+
+ mesa =
+ (pkgs.mesa.override {
+ inherit
+ directx-headers
+ libdrm
+ meson
+ ;
+
+ # we use the new flag for this
+ enablePatentEncumberedCodecs = false;
+
+ vulkanDrivers =
+ if pkgs.stdenv.isLinux
+ then
+ [
+ "amd" # AMD (aka RADV)
+ "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen)
+ "swrast" # software renderer (aka Lavapipe)
+ "nouveau-experimental" # nvk
+ ]
+ ++ lib.optionals (pkgs.stdenv.hostPlatform.isAarch -> lib.versionAtLeast pkgs.stdenv.hostPlatform.parsed.cpu.version "6") [
+ # QEMU virtualized GPU (aka VirGL)
+ # Requires ATOMIC_INT_LOCK_FREE == 2.
+ "virtio"
+ ]
+ ++ lib.optionals pkgs.stdenv.isAarch64 [
+ "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D)
+ "freedreno" # Qualcomm Adreno (all Qualcomm SoCs)
+ "imagination-experimental" # PowerVR Rogue (currently N/A)
+ "panfrost" # ARM Mali Midgard and up (T/G series)
+ ]
+ ++ lib.optionals pkgs.stdenv.hostPlatform.isx86 [
+ "intel" # Intel (aka ANV), could work on non-x86 with PCIe cards, but doesn't build
+ "intel_hasvk" # Intel Haswell/Broadwell, "legacy" Vulkan driver (https://www.phoronix.com/news/Intel-HasVK-Drop-Dead-Code)
+ ]
+ else ["auto"];
+ })
+ .overrideAttrs (new: old: {
+ version = "24.0.0-rc1";
+
+ src = pkgs.fetchurl {
+ urls = [
+ "https://archive.mesa3d.org/mesa-${new.version}.tar.xz"
+ "https://mesa.freedesktop.org/archive/mesa-${new.version}.tar.xz"
+ ];
+
+ hash = "sha256-hvsZnrrNlztnUjgdbTnyOLg+V749aVeMOCQ1OkCujO4=";
+ };
+
+ nativeBuildInputs = old.nativeBuildInputs ++ [pkgs.rustc pkgs.rust-bindgen];
+
+ patches =
+ map replacePatches old.patches
+ ++ lib.optionals (!pkgs.stdenv.hostPlatform.is32bit) [
+ revert26943
+ revert24386_1
+ revert24386_2
+ ];
+
+ postPatch =
+ old.postPatch
+ + ''
+ mkdir subprojects/packagecache
+ ${subprojects}
+ '';
+
+ mesonFlags = old.mesonFlags ++ lib.optional (!pkgs.stdenv.hostPlatform.is32bit) "-D video-codecs=all";
+ });
+in
+ mesa
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 18:17:00 +0000