Commit bea50e5f authored by Martino Fontana's avatar Martino Fontana
Browse files

treewide: remove `multiArch=false` from `buildFHSEnv` usages 

Cleanup after the work of #240860.
Also preventing new packages to copy from outdated ones.
parent 3281bec7

pkgs/applications/audio/plexamp/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/applications/blockchains/mycrypto/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/applications/misc/joplin-desktop/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -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"

pkgs/applications/misc/marktext/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -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

pkgs/applications/misc/notable/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -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