Commit 04413f50 authored by Bjørn Forsman's avatar Bjørn Forsman
Browse files

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 cae417d3 ("quartus-prime: use buildFHSEnvChroot")
parent 169dc22b

pkgs/applications/editors/quartus-prime/default.nix

+6 −2
Original line number Diff line number Diff line 
{ 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; };