Merge pull request #3 from ryanorendorff/qsys
Add libXi dependency to enable Platform Designer
This commit is contained in:
commit
24bf1627ec
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
result
|
@ -13,7 +13,7 @@ Simply import the top-level expression for the desired Quartus version. For
|
|||||||
example, to build the Lite Edition of Quartus Prime 18:
|
example, to build the Lite Edition of Quartus Prime 18:
|
||||||
|
|
||||||
```
|
```
|
||||||
$ nix build "(import ./lite18.nix)"
|
$ nix-build -E "(import ./lite18.nix)"
|
||||||
```
|
```
|
||||||
|
|
||||||
To install the same version:
|
To install the same version:
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
, nukeReferences, glibcLocales, libfaketime, coreutils, gnugrep, gnused, proot
|
, nukeReferences, glibcLocales, libfaketime, coreutils, gnugrep, gnused, proot
|
||||||
# Runtime dependencies
|
# Runtime dependencies
|
||||||
, zlib, glib, libpng12, freetype, libSM, libICE, libXrender, fontconfig
|
, zlib, glib, libpng12, freetype, libSM, libICE, libXrender, fontconfig
|
||||||
, libXext, libX11, libXtst, gtk2, bzip2, libelf
|
, libXext, libX11, libXtst, gtk2, bzip2, libelf, libXi
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{ baseName
|
{ baseName
|
||||||
@ -68,6 +68,7 @@ let
|
|||||||
pkgsi686Linux.xorg.libXrender pkgsi686Linux.fontconfig.lib
|
pkgsi686Linux.xorg.libXrender pkgsi686Linux.fontconfig.lib
|
||||||
pkgsi686Linux.xorg.libXext pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXtst
|
pkgsi686Linux.xorg.libXext pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXtst
|
||||||
pkgsi686Linux.gtk2 pkgsi686Linux.bzip2.out pkgsi686Linux.libelf
|
pkgsi686Linux.gtk2 pkgsi686Linux.bzip2.out pkgsi686Linux.libelf
|
||||||
|
pkgsi686Linux.xorg.libXi
|
||||||
pkgsi686Linux.stdenv.cc.cc.lib
|
pkgsi686Linux.stdenv.cc.cc.lib
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -75,7 +76,7 @@ let
|
|||||||
runtimeLibPath64 =
|
runtimeLibPath64 =
|
||||||
stdenv.lib.makeLibraryPath
|
stdenv.lib.makeLibraryPath
|
||||||
[ zlib glib libpng12 freetype libSM libICE libXrender fontconfig.lib
|
[ 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
|
stdenv.cc.cc.lib
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
, requireFile
|
, requireFile
|
||||||
# Runtime libraries:
|
# Runtime libraries:
|
||||||
, zlib, glib, libpng12, freetype, libSM, libICE, libXrender, fontconfig
|
, zlib, glib, libpng12, freetype, libSM, libICE, libXrender, fontconfig
|
||||||
, libXext, libX11, libXtst, gtk2, bzip2, libelf
|
, libXext, libX11, libXtst, gtk2, bzip2, libelf, libXi
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
@ -16,7 +16,7 @@ let
|
|||||||
nukeReferences glibcLocales libfaketime coreutils gnugrep gnused proot
|
nukeReferences glibcLocales libfaketime coreutils gnugrep gnused proot
|
||||||
# Runtime libraries:
|
# Runtime libraries:
|
||||||
zlib glib libpng12 freetype libSM libICE libXrender fontconfig
|
zlib glib libpng12 freetype libSM libICE libXrender fontconfig
|
||||||
libXext libX11 libXtst gtk2 bzip2 libelf;
|
libXext libX11 libXtst gtk2 bzip2 libelf libXi;
|
||||||
};
|
};
|
||||||
|
|
||||||
mkCommonQuartus = srcAttrs:
|
mkCommonQuartus = srcAttrs:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user