From 95254551f6da3475725942fcca506ed4f720d984 Mon Sep 17 00:00:00 2001 From: Ryan Orendorff <12442942+ryanorendorff@users.noreply.github.com> Date: Thu, 22 Oct 2020 21:44:48 -0700 Subject: [PATCH 1/3] Ignore nix-build result folder --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b2be92b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result 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 2/3] 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: From 6ccfb8c41f47c475a209b144fa30a6d5d16ca937 Mon Sep 17 00:00:00 2001 From: Ryan Orendorff <12442942+ryanorendorff@users.noreply.github.com> Date: Thu, 22 Oct 2020 21:46:48 -0700 Subject: [PATCH 3/3] Fix build instruction: nix build -> nix-build -E --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 781a00e..6ba5754 100644 --- a/README.md +++ b/README.md @@ -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: ``` -$ nix build "(import ./lite18.nix)" +$ nix-build -E "(import ./lite18.nix)" ``` To install the same version: