treewide: remove multiArch=false from buildFHSEnv usages
Cleanup after the work of #240860. Also preventing new packages to copy from outdated ones.
This commit is contained in:
@@ -16,7 +16,6 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
|
|||||||
@@ -24,10 +24,9 @@ let
|
|||||||
categories = [ "Finance" ];
|
categories = [ "Finance" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
in appimageTools.wrapType2 rec {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
multiArch = false; # no p32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ let
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
source "${makeWrapper}/nix-support/setup-hook"
|
source "${makeWrapper}/nix-support/setup-hook"
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
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 ];
|
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ];
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
|
install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ let
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiPkgs = null; # no 32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications
|
install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ in
|
|||||||
appimageTools.wrapType2 rec {
|
appimageTools.wrapType2 rec {
|
||||||
inherit pname version src;
|
inherit pname version src;
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ];
|
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ];
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
|
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ let
|
|||||||
in appimageTools.wrapType2 {
|
in appimageTools.wrapType2 {
|
||||||
inherit pname src version;
|
inherit pname src version;
|
||||||
|
|
||||||
multiArch = false;
|
|
||||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ in appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false;
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop
|
install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ in appimageTools.wrapType2 rec {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
mkdir "$out/share"
|
mkdir "$out/share"
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ let
|
|||||||
in appimageTools.wrapType2 rec {
|
in appimageTools.wrapType2 rec {
|
||||||
inherit name pname src;
|
inherit name pname src;
|
||||||
|
|
||||||
multiArch = false;
|
|
||||||
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ];
|
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ];
|
||||||
|
|
||||||
# Also expose the udev rules here, so it can be used as:
|
# Also expose the udev rules here, so it can be used as:
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ buildFHSEnv {
|
|||||||
pyserial
|
pyserial
|
||||||
]))
|
]))
|
||||||
]);
|
]);
|
||||||
multiArch = false;
|
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
${lib.optionalString withGui ''
|
${lib.optionalString withGui ''
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ appimageTools.wrapType2 {
|
|||||||
export LC_ALL=C.UTF-8
|
export LC_ALL=C.UTF-8
|
||||||
'';
|
'';
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
|
||||||
|
|
||||||
extraInstallCommands = ''
|
extraInstallCommands = ''
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ in appimageTools.wrapAppImage {
|
|||||||
inherit pname version;
|
inherit pname version;
|
||||||
src = appimageContents;
|
src = appimageContents;
|
||||||
|
|
||||||
multiArch = false; # no 32bit needed
|
|
||||||
extraPkgs = { pkgs, ... }@args: [
|
extraPkgs = { pkgs, ... }@args: [
|
||||||
pkgs.hidapi
|
pkgs.hidapi
|
||||||
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
|
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
|
||||||
|
|||||||
Reference in New Issue
Block a user