From 66c92824ab86705b384c74411b4909abbe1ac6ee Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date: Sun, 26 Apr 2020 23:45:55 +0200
Subject: [PATCH] Fix 32 bits for nvidia and nvidia bumblebee

I was able to test for nvidia bumblebee.
---
 default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/default.nix b/default.nix
index 07861ff..e6fd2c2 100644
--- a/default.nix
+++ b/default.nix
@@ -88,13 +88,12 @@ rec {
       kernel = null;
   };
 
-  # TODO: 32bit version? Looks like it works fine without anything special.
   nixGLNvidiaBumblebee = addNvidiaVersion (writeExecutable {
     name = "nixGLNvidiaBumblebee";
     text = ''
       #!/usr/bin/env sh
       export LD_LIBRARY_PATH=${lib.makeLibraryPath [nvidia]}:$LD_LIBRARY_PATH
-      ${bumblebee}/bin/optirun --ldpath ${lib.makeLibraryPath [libglvnd nvidia]} "$@"
+      ${bumblebee}/bin/optirun --ldpath ${lib.makeLibraryPath ([libglvnd nvidia] ++ lib.optionals enable32bits [nvidia.lib32 pkgsi686Linux.libglvnd])} "$@"
       '';
   });
 
@@ -108,7 +107,8 @@ rec {
       export LD_LIBRARY_PATH=${lib.makeLibraryPath ([
         libglvnd
         nvidiaLibsOnly
-      ] ++ lib.optional (api == "Vulkan") nixpkgs.vulkan-validation-layers)
+      ] ++ lib.optional (api == "Vulkan") nixpkgs.vulkan-validation-layers
+      ++ lib.optionals enable32bits [nvidiaLibsOnly.lib32 pkgsi686Linux.libglvnd])
       }:''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
       "$@"
       '';