summary refs log tree commit diff
path: root/pkgs/development/libraries/mesa
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-01-31 00:03:07 +0000
committerGitHub <noreply@github.com>2023-01-31 00:03:07 +0000
commit33d4318fcc6da9d754e5919126e54a64f1f9ab43 (patch)
treefb13a6355279d5b39f4c31dd34dd2ec9dbea3e0a /pkgs/development/libraries/mesa
parent106af1cb72e38d0ea21a3e60dee36fa2cb1288f1 (diff)
parentdd1ff149da07cd25a3e0152c67184e049256fcf1 (diff)
downloadnixpkgs-33d4318fcc6da9d754e5919126e54a64f1f9ab43.tar
nixpkgs-33d4318fcc6da9d754e5919126e54a64f1f9ab43.tar.gz
nixpkgs-33d4318fcc6da9d754e5919126e54a64f1f9ab43.tar.bz2
nixpkgs-33d4318fcc6da9d754e5919126e54a64f1f9ab43.tar.lz
nixpkgs-33d4318fcc6da9d754e5919126e54a64f1f9ab43.tar.xz
nixpkgs-33d4318fcc6da9d754e5919126e54a64f1f9ab43.tar.zst
nixpkgs-33d4318fcc6da9d754e5919126e54a64f1f9ab43.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/mesa')
-rw-r--r--pkgs/development/libraries/mesa/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 2d47b090b1a..3c3c08e3847 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -39,7 +39,11 @@
       "amd" # AMD (aka RADV)
       "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen)
       "swrast" # software renderer (aka Lavapipe)
-      "virtio-experimental" # QEMU virtualized GPU (aka VirGL)
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [
+      # QEMU virtualized GPU (aka VirGL)
+      # Requires ATOMIC_INT_LOCK_FREE == 2.
+      "virtio-experimental"
     ]
     ++ lib.optionals stdenv.isAarch64 [
       "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D)