swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

quartus-prime-lite: buildFHSEnvChroot -> buildFHSEnv

Browse source 
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 cae417d315 ("quartus-prime: use buildFHSEnvChroot")
This commit is contained in:
Bjørn Forsman 2023-09-24 12:03:37 +02:00
parent 169dc22b96
commit 04413f50b9
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/editors/quartus-prime/default.nix
View file

@ -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; };