From 1da4e07ea68c1782f11889f507d3e923d6b9ad85 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 14:00:33 -0800 Subject: [PATCH 1/2] linuxPackage.nvidia_x11: suffix x86_64 vulkan icd This matches mesa behavior --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index d108ca0d0060..24ab34c4ea9d 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -89,10 +89,11 @@ installPhase() { sed -E "s#(libGLX_nvidia)#$i/lib/\\1#" nvidia_icd.json > nvidia_icd.json.fixed fi + # nvidia currently only supports x86_64 and i686 if [ "$system" = "i686-linux" ]; then install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.i686.json else - install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.json + install -Dm644 nvidia_icd.json.fixed $i/share/vulkan/icd.d/nvidia_icd.x86_64.json fi fi From 82b2a833d85d951e207e1c572725b7fc327c7845 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 5 Feb 2022 14:01:11 -0800 Subject: [PATCH 2/2] linuxPackages.nvidia_x11: add jonringer as maintainer --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 3b4ed64bda07..c7e062534a4d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -115,7 +115,7 @@ let description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ jonringer ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; };