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.
This commit is contained in:
Ryan Orendorff 2020-10-22 21:44:59 -07:00
parent 95254551f6
commit 672449bce2
2 changed files with 5 additions and 4 deletions

View File

@ -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
];

View File

@ -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: