diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index fce44b4..07651dd 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -238,7 +238,20 @@ also known as DXTn or DXTC) for Mesa.")
         ("python" ,python-2)))
     (arguments
      `(#:configure-flags
-       '("--with-gallium-drivers=i915,r300,r600,svga,swrast,nouveau,virgl"
+       '(,@(match (%current-system)
+             ;; Every architecture gets its own set of drivers.
+             ((or "x86_64-linux" "i686-linux")
+              '("--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,virgl"
+                "--with-dri-drivers=915,i965,nouveau,r200,radeon,swrast"))
+             ((or "armhf-linux" "aarch64-linux")
+              '("--with-galluim-drivers=freedreno,nouveau,r300,r600,svga,svrast,vc4,virgl"
+                "--with-dri-drivers=freedreno,nouveau,r200,radeon,swrast"))
+             ("mips64el-linux"
+              '("--with-gallium-drivers=nouveau,r300,r600,svga,svrast,virgl"
+                "--with-dri-drivers=nouveau,r200,radeon,svrast"))
+             (_
+              '("--with-gallium-drivers=i915,r300,r600,svga,swrast,nouveau,virgl"
+                "--with-dri-drivers=nouveau,r200,radeon,swrast")))
          "--enable-gallium-llvm"
          ;; Enable various optional features.  TODO: opencl requires libclc,
          ;; omx requires libomxil-bellagio
@@ -254,15 +267,7 @@ also known as DXTn or DXTC) for Mesa.")
          "--enable-shared-glapi"
          ;; Without floating point texture support, drivers such as Nouveau
          ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+.
-         "--enable-texture-float"
-
-         ;; on non-intel systems, drop i915 and i965
-         ;; from the default dri drivers
-         ,@(match (%current-system)
-             ((or "x86_64-linux" "i686-linux")
-              '())
-             (_
-              '("--with-dri-drivers=nouveau,r200,radeon,swrast"))))
+         "--enable-texture-float")
        #:phases
        (modify-phases %standard-phases
          (add-after