Unverified Commit 67eec418 authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #240860 from Atemu/fhsenv-no-multiarch

buildFHSEnv: disable multiArch by default
parents 43b091f4 67ac4b83
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ Accepted arguments are:
        Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed.
- `multiPkgs`
        Packages to be installed for all architectures supported by a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are installed by default.
- `multiArch`
        Whether to install 32bit multiPkgs into the FHSEnv in 64bit environments
- `extraBuildCommands`
        Additional commands to be executed for finalizing the directory structure.
- `extraBuildCommandsMulti`
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ let
in appimageTools.wrapType2 {
  inherit pname version src;

  multiPkgs = null; # no 32bit needed
  multiArch = false; # no 32bit needed
  extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];

  extraInstallCommands = ''
+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ let
in appimageTools.wrapType2 rec {
  inherit name src;

  multiPkgs = null; # no p32bit needed
  multiArch = false; # no p32bit needed
  extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;

  extraInstallCommands = ''
+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@
}:

let fhsEnv = {
  # Many WINE games need 32bit
  multiArch = true;

  targetPkgs = pkgs: with pkgs; [
    bottles-unwrapped
    # This only allows to enable the toggle, vkBasalt won't work if not installed with environment.systemPackages (or nix-env)
+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ in appimageTools.wrapAppImage rec {
    };
  };

  multiPkgs = null;
  multiArch = false;
  extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
    p.glib
  ];
Loading