diff options
author | Thomas Watson <twatson52@icloud.com> | 2023-11-19 14:46:14 -0600 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2023-11-19 23:29:08 +0100 |
commit | cdc306ebe6c383346b0aa31b6d760fb7da447bda (patch) | |
tree | 1d04d59594affd572096707588aa67cdae7828e4 /pkgs/applications | |
parent | 10e860ea3be494f043adff47658a411be46fe25d (diff) |
quartus-prime-lite: fix loading of libudev.so.0
Loading without a path was broken by nixpkgs commit e2d06c56951459ab3aebfb40c366ab635a021366. Fortunately we don't want libudev.so.0 in modelsim now anyway which was the reason for loading by name only, so we move it back to being 64-bit only and load it by absolute path.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/quartus-prime/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 278296f12d40a..57ad28b5b2dac 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -28,6 +28,7 @@ in buildFHSEnv rec { xorg.libICE xorg.libSM zlib + libudev0-shim # qsys requirements xorg.libXtst xorg.libXi @@ -53,7 +54,6 @@ in buildFHSEnv rec { xorg.libX11 xorg.libXext xorg.libXrender - libudev0-shim libxcrypt-legacy ]; @@ -95,7 +95,6 @@ in buildFHSEnv rec { # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when # starting most operations in many containerized environments, including WSL2, Docker, and LXC # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) - # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 # # But, as can be seen in the above resource, LD_PRELOADing libudev breaks @@ -103,7 +102,7 @@ in buildFHSEnv rec { # `(vlog-2163) Macro `<protected> is undefined.`), so only use LD_PRELOAD # for non-ModelSim wrappers. if [ "$NIXPKGS_IS_MODELSIM_WRAPPER" != 1 ]; then - export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}libudev.so.0 + export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi ''; |