diff --git a/default.nix b/default.nix
index dedc60c..56b3704 100644
--- a/default.nix
+++ b/default.nix
@@ -12,7 +12,7 @@
   # Enable 32 bits driver
   # This is on by default, you can switch it to off if you want to reduce a
   # bit the size of nixGL closure.
-  enable32bits ? true,
+  enable32bits ? pkgs.stdenv.hostPlatform.isx86,
   # Make sure to enable config.allowUnfree to the instance of nixpkgs to be
   # able to access the nvidia drivers.
   pkgs ? import <nixpkgs> {
@@ -31,4 +31,8 @@ pkgs.callPackage ./nixGL.nix ({
   } // (if enableIntelX86Extensions then {}
   else {
     intel-media-driver = null;
-  }))
+  }) // (pkgs.lib.optionalAttrs (!enable32bits) {
+    pkgsi686Linux = null;
+    driversi686Linux = null;
+  })
+)
diff --git a/nixGL.nix b/nixGL.nix
index e8556c8..ec2d5d4 100644
--- a/nixGL.nix
+++ b/nixGL.nix
@@ -242,8 +242,10 @@ let
       # nixGLNvidia or nixGLIntel using an heuristic.
       nixGLDefault = if nvidiaVersionAuto != null then
         nixGLCommon autoNvidia.nixGLNvidia
+      else if stdenv.hostPlatform.isx86 then
+        nixGLCommon nixGLIntel
       else
-        nixGLCommon nixGLIntel;
+        nixGLCommon nixGLMesa;
     } // autoNvidia;
   };
 in top // (if nvidiaVersion != null then