pyrox.dev / nixpkgs
lol
fork atom

tree-wide: use new multiArch buildFHSEnv argument

This is much more direct and sensible than setting a function null

Atemu f0c58f6e 62b2adc7

+16 -16
unified split
+1 -1
pkgs/applications/audio/plexamp/default.nix
··· 16 16 in appimageTools.wrapType2 { 17 17 inherit pname version src; 18 18 19 - multiPkgs = null; # no 32bit needed 19 + multiArch = false; # no 32bit needed 20 20 extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; 21 21 22 22 extraInstallCommands = ''
+1 -1
pkgs/applications/blockchains/mycrypto/default.nix
··· 28 28 in appimageTools.wrapType2 rec { 29 29 inherit name src; 30 30 31 - multiPkgs = null; # no p32bit needed 31 + multiArch = false; # no p32bit needed 32 32 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; 33 33 34 34 extraInstallCommands = ''
+1 -1
pkgs/applications/misc/chrysalis/default.nix
··· 14 14 }; 15 15 }; 16 16 17 - multiPkgs = null; 17 + multiArch = false; 18 18 extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ 19 19 p.glib 20 20 ];
+1 -1
pkgs/applications/misc/joplin-desktop/default.nix
··· 47 47 export LC_ALL=C.UTF-8 48 48 ''; 49 49 50 - multiPkgs = null; # no 32bit needed 50 + multiArch = false; # no 32bit needed 51 51 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; 52 52 extraInstallCommands = '' 53 53 mv $out/bin/{${name},${pname}}
+1 -1
pkgs/applications/misc/marktext/default.nix
··· 20 20 export LC_ALL=C.UTF-8 21 21 ''; 22 22 23 - multiPkgs = null; # no 32bit needed 23 + multiArch = false; # no 32bit needed 24 24 extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ 25 25 p.libsecret 26 26 p.xorg.libxkbfile
+1 -1
pkgs/applications/misc/notable/default.nix
··· 26 26 export LC_ALL=C.UTF-8 27 27 ''; 28 28 29 - multiPkgs = null; # no 32bit needed 29 + multiArch = false; # no 32bit needed 30 30 extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; 31 31 extraInstallCommands = '' 32 32 mv $out/bin/{${name},${pname}}
+1 -1
pkgs/applications/misc/zettlr/default.nix
··· 21 21 appimageTools.wrapType2 rec { 22 22 inherit name src; 23 23 24 - multiPkgs = null; # no 32bit needed 24 + multiArch = false; # no 32bit needed 25 25 extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; 26 26 extraInstallCommands = '' 27 27 mv $out/bin/{${name},${pname}}
+1 -1
pkgs/applications/networking/Sylk/default.nix
··· 17 17 export LC_ALL=C.UTF-8 18 18 ''; 19 19 20 - multiPkgs = null; # no 32bit needed 20 + multiArch = false; # no 32bit needed 21 21 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; 22 22 extraInstallCommands = "mv $out/bin/{${name},${pname}}"; 23 23
+1 -1
pkgs/applications/networking/browsers/polypane/default.nix
··· 16 16 in appimageTools.wrapType2 { 17 17 inherit pname src version; 18 18 19 - multiPkgs = null; 19 + multiArch = false; 20 20 extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; 21 21 22 22 extraInstallCommands = ''
+1 -1
pkgs/applications/networking/cluster/octant/desktop.nix
··· 27 27 export LC_ALL=C.UTF-8 28 28 ''; 29 29 30 - multiPkgs = null; # no 32bit needed 30 + multiArch = false; # no 32bit needed 31 31 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; 32 32 extraInstallCommands = 33 33 let appimageContents = appimageTools.extractType2 { inherit name src; }; in
+1 -1
pkgs/applications/networking/station/default.nix
··· 20 20 export LC_ALL=C.UTF-8 21 21 ''; 22 22 23 - multiPkgs = null; 23 + multiArch = false; 24 24 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; 25 25 extraInstallCommands = '' 26 26 mv $out/bin/{${name},${pname}}
+1 -1
pkgs/applications/office/tusk/default.nix
··· 31 31 export LC_ALL=C.UTF-8 32 32 ''; 33 33 34 - multiPkgs = null; # no 32bit needed 34 + multiArch = false; # no 32bit needed 35 35 extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; 36 36 extraInstallCommands = '' 37 37 mv $out/bin/{${pname}-${version},${pname}}
+1 -1
pkgs/development/embedded/arduino/arduino-core/chrootenv.nix
··· 14 14 pyserial 15 15 ])) 16 16 ]); 17 - multiPkgs = null; 17 + multiArch = false; 18 18 19 19 extraInstallCommands = '' 20 20 ${lib.optionalString withGui ''
+1 -1
pkgs/development/tools/database/beekeeper-studio/default.nix
··· 18 18 appimageTools.wrapType2 { 19 19 inherit name src; 20 20 21 - multiPkgs = null; # no 32bit needed 21 + multiArch = false; # no 32bit needed 22 22 extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; 23 23 24 24 extraInstallCommands = ''
+1 -1
pkgs/development/web/bloomrpc/default.nix
··· 21 21 export LC_ALL=C.UTF-8 22 22 ''; 23 23 24 - multiPkgs = null; # no 32bit needed 24 + multiArch = false; # no 32bit needed 25 25 extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; 26 26 27 27 extraInstallCommands = ''
+1 -1
pkgs/tools/misc/flexoptix-app/default.nix
··· 28 28 inherit pname version; 29 29 src = appimageContents; 30 30 31 - multiPkgs = null; # no 32bit needed 31 + multiArch = false; # no 32bit needed 32 32 extraPkgs = { pkgs, ... }@args: [ 33 33 pkgs.hidapi 34 34 ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;