diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-27 13:51:16 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2017-01-29 02:08:04 +0200 |
| commit | ef089634bf83788ec9b0d60851e4c7e4a5611e76 (patch) | |
| tree | e5144f6c169986b4f78b1861506d34e8b564f275 /pkgs | |
| parent | 137bf7269e5a36f396b8ca886682cdf0e692c741 (diff) | |
| download | nixlib-ef089634bf83788ec9b0d60851e4c7e4a5611e76.tar nixlib-ef089634bf83788ec9b0d60851e4c7e4a5611e76.tar.gz nixlib-ef089634bf83788ec9b0d60851e4c7e4a5611e76.tar.bz2 nixlib-ef089634bf83788ec9b0d60851e4c7e4a5611e76.tar.lz nixlib-ef089634bf83788ec9b0d60851e4c7e4a5611e76.tar.xz nixlib-ef089634bf83788ec9b0d60851e4c7e4a5611e76.tar.zst nixlib-ef089634bf83788ec9b0d60851e4c7e4a5611e76.zip | |
mesa: Enable some ARM drivers
And disable freedreno from others since it's not useful there.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2fc1bfea0842..e5cbe8977f02 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,13 +67,14 @@ stdenv.mkDerivation { "--with-dri-driverdir=$(drivers)/lib/dri" "--with-dri-searchpath=${driverLink}/lib/dri" "--with-egl-platforms=x11,wayland,drm" - ] - ++ optionals (stdenv.system != "armv7l-linux") [ - "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast" + ] ++ (if stdenv.isArm || stdenv.isAarch64 then [ + "--with-gallium-drivers=nouveau,freedreno,vc4,swrast" + "--with-dri-drivers=nouveau,swrast" + ] else [ + "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,swrast" "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast" "--with-vulkan-drivers=intel" - ] - ++ [ + ]) ++ [ (enableFeature enableTextureFloats "texture-float") (enableFeature grsecEnabled "glx-rts") (enableFeature stdenv.isLinux "dri3") @@ -134,14 +135,6 @@ stdenv.mkDerivation { $out/lib/libxatracker* \ $out/lib/libvulkan_* - # move share/vulkan/icd.d/ - mv $out/share/ $drivers/ - # Update search path used by Vulkan (it's pointing to $out but - # drivers are in $drivers) - for js in $drivers/share/vulkan/icd.d/*.json; do - substituteInPlace "$js" --replace "$out" "$drivers" - done - mv $out/lib/dri/* $drivers/lib/dri # */ rmdir "$out/lib/dri" @@ -154,6 +147,14 @@ stdenv.mkDerivation { # set the default search path for DRI drivers; used e.g. by X server substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}" + '' + optionalString (!(stdenv.isArm || stdenv.isAarch64)) '' + # move share/vulkan/icd.d/ + mv $out/share/ $drivers/ + # Update search path used by Vulkan (it's pointing to $out but + # drivers are in $drivers) + for js in $drivers/share/vulkan/icd.d/*.json; do + substituteInPlace "$js" --replace "$out" "$drivers" + done ''; # TODO: |