From 672449bce25db06e812753ba7bea78efb0b5ac43 Mon Sep 17 00:00:00 2001
From: Ryan Orendorff <12442942+ryanorendorff@users.noreply.github.com>
Date: Thu, 22 Oct 2020 21:44:59 -0700
Subject: [PATCH] Add libXi dependency to enable Platform Designer

Platform Designer previously would not run due to not having libXi in
the library path. This patch adds the library to both the 32 bit and 64
bit versions of the package.
---
 generic.nix          | 5 +++--
 quartus-versions.nix | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/generic.nix b/generic.nix
index f43cac6..270081d 100644
--- a/generic.nix
+++ b/generic.nix
@@ -2,7 +2,7 @@
 , nukeReferences, glibcLocales, libfaketime, coreutils, gnugrep, gnused, proot
 # Runtime dependencies
 , zlib, glib, libpng12, freetype, libSM, libICE, libXrender, fontconfig
-, libXext, libX11, libXtst, gtk2, bzip2, libelf
+, libXext, libX11, libXtst, gtk2, bzip2, libelf, libXi
 }:
 
 { baseName
@@ -68,6 +68,7 @@ let
         pkgsi686Linux.xorg.libXrender pkgsi686Linux.fontconfig.lib
         pkgsi686Linux.xorg.libXext pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXtst
         pkgsi686Linux.gtk2 pkgsi686Linux.bzip2.out pkgsi686Linux.libelf
+        pkgsi686Linux.xorg.libXi
         pkgsi686Linux.stdenv.cc.cc.lib
       ];
 
@@ -75,7 +76,7 @@ let
   runtimeLibPath64 =
     stdenv.lib.makeLibraryPath
     [ zlib glib libpng12 freetype libSM libICE libXrender fontconfig.lib
-      libXext libX11 libXtst gtk2 bzip2.out libelf
+      libXext libX11 libXtst gtk2 bzip2.out libelf libXi
       stdenv.cc.cc.lib
     ];
 
diff --git a/quartus-versions.nix b/quartus-versions.nix
index e5aa040..c46f033 100644
--- a/quartus-versions.nix
+++ b/quartus-versions.nix
@@ -3,7 +3,7 @@
 , requireFile
 # Runtime libraries:
 , zlib, glib, libpng12, freetype, libSM, libICE, libXrender, fontconfig
-, libXext, libX11, libXtst, gtk2, bzip2, libelf
+, libXext, libX11, libXtst, gtk2, bzip2, libelf, libXi
 }:
 
 let
@@ -16,7 +16,7 @@ let
       nukeReferences glibcLocales libfaketime coreutils gnugrep gnused proot
       # Runtime libraries:
       zlib glib libpng12 freetype libSM libICE libXrender fontconfig
-      libXext libX11 libXtst gtk2 bzip2 libelf;
+      libXext libX11 libXtst gtk2 bzip2 libelf libXi;
   };
 
   mkCommonQuartus = srcAttrs: