treewide: remove multiArch=false from buildFHSEnv usages

Cleanup after the work of #240860. Also preventing new packages to copy from outdated ones.
2024-04-24 22:51:13 +02:00
parent 3281bec717
commit bea50e5f6e
15 changed files with 1 additions and 16 deletions
--- a/pkgs/applications/audio/plexamp/default.nix
+++ b/pkgs/applications/audio/plexamp/default.nix
@@ -16,7 +16,6 @@ let
 in appimageTools.wrapType2 {
  inherit pname version src;

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

  extraInstallCommands = ''
--- a/pkgs/applications/blockchains/mycrypto/default.nix
+++ b/pkgs/applications/blockchains/mycrypto/default.nix
@@ -24,10 +24,9 @@ let
    categories = [ "Finance" ];
  };

-in appimageTools.wrapType2 rec {
+in appimageTools.wrapType2 {
  inherit pname version src;

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

  extraInstallCommands = ''
--- a/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/pkgs/applications/misc/joplin-desktop/default.nix
@@ -49,7 +49,6 @@ let
      export LC_ALL=C.UTF-8
    '';

-    multiArch = false; # no 32bit needed
    extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
    extraInstallCommands = ''
      source "${makeWrapper}/nix-support/setup-hook"
--- a/pkgs/applications/misc/marktext/default.nix
+++ b/pkgs/applications/misc/marktext/default.nix
@@ -20,7 +20,6 @@ appimageTools.wrapType2 rec {
    export LC_ALL=C.UTF-8
  '';

-  multiArch = false; # no 32bit needed
  extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
    p.libsecret
    p.xorg.libxkbfile
--- a/pkgs/applications/misc/notable/default.nix
+++ b/pkgs/applications/misc/notable/default.nix
@@ -24,7 +24,6 @@ appimageTools.wrapType2 rec {
    export LC_ALL=C.UTF-8
  '';

-  multiArch = false; # no 32bit needed
  extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ];
  extraInstallCommands = ''
    install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
--- a/pkgs/applications/misc/notesnook/default.nix
+++ b/pkgs/applications/misc/notesnook/default.nix
@@ -48,7 +48,6 @@ let
      export LC_ALL=C.UTF-8
    '';

-    multiPkgs = null; # no 32bit needed
    extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
    extraInstallCommands = ''
      install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications
--- a/pkgs/applications/misc/zettlr/generic.nix
+++ b/pkgs/applications/misc/zettlr/generic.nix
@@ -21,7 +21,6 @@ in
 appimageTools.wrapType2 rec {
  inherit pname version src;

-  multiArch = false; # no 32bit needed
  extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ];
  extraInstallCommands = ''
    install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
--- a/pkgs/applications/networking/Sylk/default.nix
+++ b/pkgs/applications/networking/Sylk/default.nix
@@ -17,7 +17,6 @@ appimageTools.wrapType2 rec {
    export LC_ALL=C.UTF-8
  '';

-  multiArch = false; # no 32bit needed
  extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;

  meta = with lib; {
--- a/pkgs/applications/networking/browsers/polypane/default.nix
+++ b/pkgs/applications/networking/browsers/polypane/default.nix
@@ -16,7 +16,6 @@ let
 in appimageTools.wrapType2 {
  inherit pname src version;

-  multiArch = false;
  extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];

  extraInstallCommands = ''
--- a/pkgs/applications/networking/station/default.nix
+++ b/pkgs/applications/networking/station/default.nix
@@ -19,7 +19,6 @@ in appimageTools.wrapType2 rec {
    export LC_ALL=C.UTF-8
  '';

-  multiArch = false;
  extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
  extraInstallCommands = ''
    install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop
--- a/pkgs/applications/office/tusk/default.nix
+++ b/pkgs/applications/office/tusk/default.nix
@@ -31,7 +31,6 @@ in appimageTools.wrapType2 rec {
    export LC_ALL=C.UTF-8
  '';

-  multiArch = false; # no 32bit needed
  extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
  extraInstallCommands = ''
    mkdir "$out/share"
--- a/pkgs/by-name/ch/chrysalis/package.nix
+++ b/pkgs/by-name/ch/chrysalis/package.nix
@@ -14,7 +14,6 @@ let
 in appimageTools.wrapType2 rec {
  inherit name pname src;

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

  # Also expose the udev rules here, so it can be used as:
--- a/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix
+++ b/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix
@@ -14,7 +14,6 @@ buildFHSEnv {
        pyserial
      ]))
    ]);
-  multiArch = false;

  extraInstallCommands = ''
    ${lib.optionalString withGui ''
--- a/pkgs/development/web/bloomrpc/default.nix
+++ b/pkgs/development/web/bloomrpc/default.nix
@@ -21,7 +21,6 @@ appimageTools.wrapType2 {
    export LC_ALL=C.UTF-8
  '';

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

  extraInstallCommands = ''
--- a/pkgs/tools/misc/flexoptix-app/default.nix
+++ b/pkgs/tools/misc/flexoptix-app/default.nix
@@ -28,7 +28,6 @@ in appimageTools.wrapAppImage {
  inherit pname version;
  src = appimageContents;

-  multiArch = false; # no 32bit needed
  extraPkgs = { pkgs, ... }@args: [
    pkgs.hidapi
  ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;