movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-22 09:20:58 +03:00
Code Activity

tree-wide: use new multiArch buildFHSEnv argument

Browse source 
This is much more direct and sensible than setting a function null
This commit is contained in:
Atemu 2023-07-01 13:35:55 +02:00
parent 62b2adc753
commit f0c58f6e96
16 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/audio/plexamp/default.nix
View file

@ -16,7 +16,7 @@ let
in appimageTools.wrapType2 { in appimageTools.wrapType2 {
inherit pname version src; inherit pname version src;
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
extraInstallCommands = '' extraInstallCommands = ''

2
pkgs/applications/blockchains/mycrypto/default.nix
View file

@ -28,7 +28,7 @@ let
in appimageTools.wrapType2 rec { in appimageTools.wrapType2 rec {
inherit name src; inherit name src;
multiPkgs = null; # no p32bit needed multiArch = false; # no p32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = '' extraInstallCommands = ''

2
pkgs/applications/misc/chrysalis/default.nix
View file

@ -14,7 +14,7 @@ in appimageTools.wrapAppImage rec {
}; };
}; };
multiPkgs = null; multiArch = false;
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.glib p.glib
]; ];

2
pkgs/applications/misc/joplin-desktop/default.nix
View file

@ -47,7 +47,7 @@ let
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
''; '';
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}

2
pkgs/applications/misc/marktext/default.nix
View file

@ -20,7 +20,7 @@ appimageTools.wrapType2 rec {
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
''; '';
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
p.libsecret p.libsecret
p.xorg.libxkbfile p.xorg.libxkbfile

2
pkgs/applications/misc/notable/default.nix
View file

@ -26,7 +26,7 @@ appimageTools.wrapType2 rec {
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
''; '';
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ];
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}

2
pkgs/applications/misc/zettlr/default.nix
View file

@ -21,7 +21,7 @@ in
appimageTools.wrapType2 rec { appimageTools.wrapType2 rec {
inherit name src; inherit name src;
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ]; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texlive pandoc ];
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}

2
pkgs/applications/networking/Sylk/default.nix
View file

@ -17,7 +17,7 @@ appimageTools.wrapType2 rec {
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
''; '';
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = "mv $out/bin/{${name},${pname}}"; extraInstallCommands = "mv $out/bin/{${name},${pname}}";

2
pkgs/applications/networking/browsers/polypane/default.nix
View file

@ -16,7 +16,7 @@ let
in appimageTools.wrapType2 { in appimageTools.wrapType2 {
inherit pname src version; inherit pname src version;
multiPkgs = null; multiArch = false;
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
extraInstallCommands = '' extraInstallCommands = ''

2
pkgs/applications/networking/cluster/octant/desktop.nix
View file

@ -27,7 +27,7 @@ let
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
''; '';
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = extraInstallCommands =
let appimageContents = appimageTools.extractType2 { inherit name src; }; in let appimageContents = appimageTools.extractType2 { inherit name src; }; in

2
pkgs/applications/networking/station/default.nix
View file

@ -20,7 +20,7 @@ in appimageTools.wrapType2 rec {
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
''; '';
multiPkgs = null; multiArch = false;
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/{${name},${pname}} mv $out/bin/{${name},${pname}}

2
pkgs/applications/office/tusk/default.nix
View file

@ -31,7 +31,7 @@ in appimageTools.wrapType2 rec {
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
''; '';
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = '' extraInstallCommands = ''
mv $out/bin/{${pname}-${version},${pname}} mv $out/bin/{${pname}-${version},${pname}}

2
pkgs/development/embedded/arduino/arduino-core/chrootenv.nix
View file

@ -14,7 +14,7 @@ buildFHSEnv {
pyserial pyserial
])) ]))
]); ]);
multiPkgs = null; multiArch = false;
extraInstallCommands = '' extraInstallCommands = ''
${lib.optionalString withGui '' ${lib.optionalString withGui ''

2
pkgs/development/tools/database/beekeeper-studio/default.nix
View file

@ -18,7 +18,7 @@ in
appimageTools.wrapType2 { appimageTools.wrapType2 {
inherit name src; inherit name src;
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
extraInstallCommands = '' extraInstallCommands = ''

2
pkgs/development/web/bloomrpc/default.nix
View file

@ -21,7 +21,7 @@ appimageTools.wrapType2 {
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
''; '';
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
extraInstallCommands = '' extraInstallCommands = ''

2
pkgs/tools/misc/flexoptix-app/default.nix
View file

@ -28,7 +28,7 @@ in appimageTools.wrapAppImage {
inherit pname version; inherit pname version;
src = appimageContents; src = appimageContents;
multiPkgs = null; # no 32bit needed multiArch = false; # no 32bit needed
extraPkgs = { pkgs, ... }@args: [ extraPkgs = { pkgs, ... }@args: [
pkgs.hidapi pkgs.hidapi
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;