From 04413f50b9ccda9c2838f5d2b69411aced2079ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Sep 2023 12:03:37 +0200 Subject: [PATCH] quartus-prime-lite: buildFHSEnvChroot -> buildFHSEnv The former is deprecated. The latter is implemented with buildFHSEnvBubblewrap. The reason this package was switched to buildFHSEnvChroot in the first place[1] is fixed by passing `multiArch = true` (which brings e.g. 32-bit dynamic loader /lib/ld-linux.so.2). [1] Commit cae417d315dd27 ("quartus-prime: use buildFHSEnvChroot") --- pkgs/applications/editors/quartus-prime/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 8da6cd44ca70..d2ffcd088fb8 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildFHSEnvChroot, callPackage, makeDesktopItem, writeScript +{ stdenv, lib, buildFHSEnv, callPackage, makeDesktopItem, writeScript , supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] , unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; } }: @@ -13,7 +13,7 @@ let categories = [ "Development" ]; }; # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` -in buildFHSEnvChroot rec { +in buildFHSEnv rec { name = "quartus-prime-lite"; # wrapped targetPkgs = pkgs: with pkgs; [ @@ -31,6 +31,10 @@ in buildFHSEnvChroot rec { xorg.libXtst xorg.libXi ]; + + # Also support 32-bit executables. + multiArch = true; + multiPkgs = pkgs: with pkgs; let # This seems ugly - can we override `libpng = libpng12` for all `pkgs`? freetype = pkgs.freetype.override { libpng = libpng12; };