occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Revert "flake: fix vivado on recent nixpkgs (closes #2274)" 

This reverts commit 931b3172c4.
This commit is contained in:
Sebastien Bourdeauducq 2023-12-03 10:27:01 +08:00
parent 9a9b3b7858
commit 8c520422f2
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -173,9 +173,7 @@
vivado = pkgs.buildFHSEnv { vivado = pkgs.buildFHSEnv {
name = "vivado"; name = "vivado";
targetPkgs = vivadoDeps; targetPkgs = vivadoDeps;
# Include /usr/lib to FHS env to fix `libtinfo.so.5` not found error profile = "set -e; source /opt/Xilinx/Vivado/2022.2/settings64.sh";
# Path has been removed in https://github.com/NixOS/nixpkgs/pull/263201
profile = "set -e; source /opt/Xilinx/Vivado/2022.2/settings64.sh; export LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH";
runScript = "vivado"; runScript = "vivado";
}; };