From 27343e2e62e0261fd83167fe1e85e8b4e7f69ace Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 2 Apr 2022 09:25:30 +0300
Subject: [PATCH] Properly fix libGL.so.1 issue - thanks to comment from #4

---
 common.nix | 3 +++
 flake.nix  | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common.nix b/common.nix
index cad9a1a..8ef02b0 100644
--- a/common.nix
+++ b/common.nix
@@ -48,6 +48,9 @@ pkgs:
   # Keyboard input may not work in simulink otherwise
   libxkbcommon
   xkeyboard_config
+
+  # Needed since 2022a
+  libglvnd
 ]) ++ (with pkgs.xorg; [
   libSM
   libX11
diff --git a/flake.nix b/flake.nix
index d4fbd04..344fe1b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -131,9 +131,6 @@
       name = "matlab-shell";
       inherit targetPkgs;
       runScript = shellHooksCommon + ''
-        # Needed only for installation from some reason, see:
-        # https://discourse.nixos.org/t/a-non-nixos-linux-binary-matlab-requires-libgl-so-1-twice/18379/2
-        export LD_PRELOAD=${pkgs.libglvnd}/lib/libGL.so.1
         cat <<EOF
         ============================
         welcome to nix-matlab shell!