Merge pull request #279260 from SuperSamus/multiPkgs-false-remove

treewide: remove `multiArch=false` and wrong usage of `extraPkgs`

Atemu b4047a04 d18b3d4b

Changed files
+43 -107
pkgs
applications
audio
plexamp
blockchains
mycrypto
graphics
upscayl
misc
bazecor
firefly-desktop
golden-cheetah-bin
joplin-desktop
marktext
mobilecoin-wallet
neo4j-desktop
notable
notesnook
todoist-electron
zettlr
networking
Sylk
browsers
polypane
cluster
lens
instant-messengers
beeper
caprine-bin
rambox
irc
irccloud
mailreaders
electron-mail
tutanota-desktop
station
office
timeular
tusk
video
lbry
losslesscut-bin
build-support
appimage
by-name
an
anytype
ar
arduino-ide
ca
caido
ch
chrysalis
ho
hoppscotch
je
jetbrains-toolbox
lm
lmstudio
mq
mqttx
no
nosql-workbench
nr
nrfconnect
si
simplex-chat-desktop
sp
spacedrive
development
embedded
arduino
arduino-core
web
bloomrpc
tools
misc
flexoptix-app
security
buttercup-desktop
+1 -4
pkgs/applications/audio/plexamp/default.nix
···
-
{ lib, fetchurl, appimageTools, pkgs }:
+
{ lib, fetchurl, appimageTools }:
let
pname = "plexamp";
···
};
in appimageTools.wrapType2 {
inherit pname version src;
-
-
multiArch = false; # no 32bit needed
-
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop
+2 -6
pkgs/applications/blockchains/mycrypto/default.nix
···
-
{ lib, appimageTools, fetchurl, makeDesktopItem
-
}:
+
{ lib, appimageTools, fetchurl, makeDesktopItem }:
let
pname = "MyCrypto";
···
categories = [ "Finance" ];
};
-
in appimageTools.wrapType2 rec {
+
in appimageTools.wrapType2 {
inherit pname version src;
-
-
multiArch = false; # no p32bit needed
-
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = ''
mkdir -p $out/share
+1 -1
pkgs/applications/graphics/upscayl/default.nix
···
appimageTools.wrapType2 {
inherit pname version src;
-
extraPkgs = pkgs: with pkgs; [vulkan-headers vulkan-loader];
+
extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ];
extraInstallCommands = ''
mkdir -p $out/share/{applications,pixmaps}
+1 -3
pkgs/applications/misc/bazecor/default.nix
···
# taken from
# https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6
-
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
-
p.glib
-
];
+
extraPkgs = pkgs: [ pkgs.glib ];
# Also expose the udev rules here, so it can be used as:
# services.udev.packages = [ pkgs.bazecor ];
+1 -1
pkgs/applications/misc/firefly-desktop/default.nix
···
in appimageTools.wrapType2 {
inherit pname version src;
-
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
+
extraPkgs = pkgs: [ pkgs.libsecret ];
extraInstallCommands = ''
mkdir -p $out/share/applications $out/share/pixmaps
+1 -1
pkgs/applications/misc/golden-cheetah-bin/default.nix
···
appimageTools.wrapType2 {
inherit pname src version;
-
extraPkgs = pkgs: with pkgs; [ R zlib libusb-compat-0_1 ];
+
extraPkgs = pkgs: [ pkgs.R pkgs.zlib pkgs.libusb-compat-0_1 ];
extraInstallCommands = ''
mv $out/bin/${pname} $out/bin/GoldenCheetah
-2
pkgs/applications/misc/joplin-desktop/default.nix
···
export LC_ALL=C.UTF-8
'';
-
multiArch = false; # no 32bit needed
-
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = ''
source "${makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/${pname} \
+1 -5
pkgs/applications/misc/marktext/default.nix
···
export LC_ALL=C.UTF-8
'';
-
multiArch = false; # no 32bit needed
-
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [
-
p.libsecret
-
p.xorg.libxkbfile
-
];
+
extraPkgs = pkgs: [ pkgs.libsecret pkgs.xorg.libxkbfile ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop
+1 -1
pkgs/applications/misc/mobilecoin-wallet/default.nix
···
in appimageTools.wrapType2 {
inherit name src;
-
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
+
extraPkgs = pkgs: [ pkgs.libsecret ];
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
+1 -1
pkgs/applications/misc/neo4j-desktop/default.nix
···
in appimageTools.wrapType2 {
inherit pname version src;
-
extraPkgs = pkgs: with pkgs; [ libsecret ];
+
extraPkgs = pkgs: [ pkgs.libsecret ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
+2 -4
pkgs/applications/misc/notable/default.nix
···
appimageContents = appimageTools.extract {
inherit pname version src;
};
-
-
nativeBuildInputs = [ makeWrapper ];
in
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 ];
+
extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ];
+
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \
-2
pkgs/applications/misc/notesnook/default.nix
···
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
install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps
+1 -3
pkgs/applications/misc/todoist-electron/default.nix
···
inherit pname version;
src = appimageContents;
-
extraPkgs = { pkgs, ... }@args: [
-
pkgs.hidapi
-
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
+
extraPkgs = pkgs: [ pkgs.hidapi ];
extraInstallCommands = ''
# Add desktop convencience stuff
+2 -2
pkgs/applications/misc/zettlr/default.nix
···
-
{ callPackage, texliveMedium }:
+
{ callPackage }:
-
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texliveMedium; })) {
+
builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
zettlr = {
version = "3.0.2";
hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA=";
+2 -4
pkgs/applications/misc/zettlr/generic.nix
···
, appimageTools
, lib
, fetchurl
-
, texliveMedium
-
, pandoc
}:
# Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs.
···
appimageTools.wrapType2 rec {
inherit pname version src;
-
multiArch = false; # no 32bit needed
-
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ];
+
extraPkgs = pkgs: [ pkgs.texliveMedium pkgs.pandoc ];
+
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop
install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png
-3
pkgs/applications/networking/Sylk/default.nix
···
export LC_ALL=C.UTF-8
'';
-
multiArch = false; # no 32bit needed
-
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
-
meta = with lib; {
description = "Sylk WebRTC client";
homepage = "https://sylkserver.com/";
+1 -2
pkgs/applications/networking/browsers/polypane/default.nix
···
in appimageTools.wrapType2 {
inherit pname src version;
-
multiArch = false;
-
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
+
extraPkgs = pkgs: [ pkgs.bash ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
+2 -2
pkgs/applications/networking/cluster/lens/linux.nix
···
-
{ lib, stdenv, pname, version, src, meta, appimageTools, makeWrapper, nss_latest }:
+
{ pname, version, src, meta, appimageTools, makeWrapper }:
let
name = "${pname}-${version}";
···
--replace 'Exec=AppRun' 'Exec=${pname}'
'';
-
extraPkgs = _: [ nss_latest ];
+
extraPkgs = pkgs: [ pkgs.nss_latest ];
}
+1 -2
pkgs/applications/networking/instant-messengers/beeper/default.nix
···
, stdenvNoCC
, fetchurl
, appimageTools
-
, libsecret
, makeWrapper
, writeShellApplication
, curl
···
};
appimage = appimageTools.wrapType2 {
inherit version pname src;
-
extraPkgs = pkgs: with pkgs; [ libsecret ];
+
extraPkgs = pkgs: [ pkgs.libsecret ];
};
appimageContents = appimageTools.extractType2 {
inherit version pname src;
+1 -4
pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix
···
-
{ lib
-
, fetchurl
+
{ fetchurl
, appimageTools
, xorg
, pname
···
profile = ''
export LC_ALL=C.UTF-8
'';
-
-
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
extraInstallCommands = ''
mkdir -p $out/share
+1 -1
pkgs/applications/networking/instant-messengers/rambox/default.nix
···
install -Dm644 ${desktopItem}/share/applications/* $out/share/applications
'';
-
extraPkgs = pkgs: with pkgs; [ procps ];
+
extraPkgs = pkgs: [ pkgs.procps ];
meta = with lib; {
description = "Workspace Simplifier - a cross-platform application organizing web services into Workspaces similar to browser profiles";
+1 -1
pkgs/applications/networking/irc/irccloud/default.nix
···
in appimageTools.wrapType2 {
inherit pname version src;
-
extraPkgs = pkgs: with pkgs; [ at-spi2-core ];
+
extraPkgs = pkgs: [ pkgs.at-spi2-core ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop
+4 -4
pkgs/applications/networking/mailreaders/electron-mail/default.nix
···
-
{ appimageTools, lib, fetchurl, libsecret }:
+
{ appimageTools, lib, fetchurl }:
let
pname = "electron-mail";
···
cp -r ${appimageContents}/usr/share/icons $out/share
'';
-
extraPkgs = pkgs: with pkgs; [
-
libsecret
-
libappindicator-gtk3
+
extraPkgs = pkgs: [
+
pkgs.libsecret
+
pkgs.libappindicator-gtk3
];
meta = with lib; {
+1 -1
pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix
···
hash = "sha256-D7qWwIFuCJmBvfdgf4Dsd2/jvi39tbAttaHOwLND4DY=";
};
-
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
+
extraPkgs = pkgs: [ pkgs.libsecret ];
extraInstallCommands =
let appimageContents = appimageTools.extract { inherit pname version src; };
-2
pkgs/applications/networking/station/default.nix
···
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
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \
+1 -4
pkgs/applications/office/timeular/default.nix
···
{ lib
, fetchurl
, appimageTools
-
, libsecret
}:
let
···
in appimageTools.wrapType2 rec {
inherit pname version src;
-
extraPkgs = pkgs: with pkgs; [
-
libsecret
-
];
+
extraPkgs = pkgs: [ pkgs.libsecret ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop
-2
pkgs/applications/office/tusk/default.nix
···
export LC_ALL=C.UTF-8
'';
-
multiArch = false; # no 32bit needed
-
extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs;
extraInstallCommands = ''
mkdir "$out/share"
ln -s "${desktopItem}/share/applications" "$out/share/"
+1 -3
pkgs/applications/video/lbry/default.nix
···
};
# At runtime, Lbry likes to have access to Ffmpeg
-
extraPkgs = pkgs: with pkgs; [
-
ffmpeg
-
];
+
extraPkgs = pkgs: [ pkgs.ffmpeg ];
# General fixup
extraInstallCommands = ''
-2
pkgs/applications/video/losslesscut-bin/build-from-appimage.nix
···
export LC_ALL=C.UTF-8
'';
-
extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps;
-
extraInstallCommands = ''
(
mkdir -p $out/share
+1 -1
pkgs/build-support/appimage/default.nix
···
wrapAppImage = args@{
src,
-
extraPkgs,
+
extraPkgs ? pkgs: [ ],
meta ? {},
...
}: buildFHSEnv
+1 -2
pkgs/by-name/an/anytype/package.nix
···
in appimageTools.wrapType2 {
inherit name src;
-
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs)
-
++ [ pkgs.libsecret ];
+
extraPkgs = pkgs: [ pkgs.libsecret ];
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
+1 -1
pkgs/by-name/ar/arduino-ide/package.nix
···
substituteInPlace $out/share/applications/${pname}.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U'
'';
-
extraPkgs = pkgs: with pkgs; [ libsecret ];
+
extraPkgs = pkgs: [ pkgs.libsecret ];
meta = with lib; {
description = "Open-source electronics prototyping platform";
+1 -1
pkgs/by-name/ca/caido/package.nix
···
in appimageTools.wrapType2 {
inherit pname src version;
-
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ];
+
extraPkgs = pkgs: [ pkgs.libthai ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications
+1 -2
pkgs/by-name/ch/chrysalis/package.nix
···
in appimageTools.wrapType2 rec {
inherit name pname src;
-
multiArch = false;
-
extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ];
+
extraPkgs = pkgs: [ pkgs.glib ];
# Also expose the udev rules here, so it can be used as:
# services.udev.packages = [ pkgs.chrysalis ];
-3
pkgs/by-name/ho/hoppscotch/package.nix
···
else appimageTools.wrapType2 {
inherit pname version src meta;
-
extraPkgs = pkgs:
-
appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
-
extraInstallCommands =
let
appimageContents = appimageTools.extractType2 { inherit pname version src; };
-1
pkgs/by-name/je/jetbrains-toolbox/package.nix
···
appimage = appimageTools.wrapAppImage {
inherit pname version;
src = appimageContents;
-
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs);
};
in
stdenv.mkDerivation {
+1 -1
pkgs/by-name/lm/lmstudio/linux.nix
···
appimageTools.wrapType2 {
inherit meta pname version src;
-
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ];
+
extraPkgs = pkgs: [ pkgs.ocl-icd ];
extraInstallCommands = ''
mkdir -p $out/share/applications
-2
pkgs/by-name/mq/mqttx/package.nix
···
appimageTools.wrapType2 {
inherit pname version src;
-
extraPkgs = pkgs: [ ];
-
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png
+2 -2
pkgs/by-name/no/nosql-workbench/package.nix
···
} else appimageTools.wrapType2 {
inherit pname version src meta;
-
extraPkgs = ps: (appimageTools.defaultFhsEnvArgs.multiPkgs ps) ++ [
+
extraPkgs = pkgs: [
# Required to run DynamoDB locally
-
ps.jdk21
+
pkgs.jdk21
];
extraInstallCommands = let
+1 -3
pkgs/by-name/nr/nrfconnect/package.nix
···
in appimageTools.wrapType2 {
inherit pname version src;
-
extraPkgs = pkgs: with pkgs; [
-
segger-jlink
-
];
+
extraPkgs = pkgs: [ pkgs.segger-jlink ];
extraInstallCommands = ''
install -Dm444 ${appimageContents}/nrfconnect.desktop -t $out/share/applications
-4
pkgs/by-name/si/simplex-chat-desktop/package.nix
···
in appimageTools.wrapType2 {
inherit pname version src;
-
extraPkgs = pkgs: with pkgs; [
-
makeWrapper
-
];
-
extraBwrapArgs = [
"--setenv _JAVA_AWT_WM_NONREPARENTING 1"
];
+1 -2
pkgs/by-name/sp/spacedrive/package.nix
···
else appimageTools.wrapType2 {
inherit pname version src meta passthru;
-
extraPkgs = pkgs:
-
(appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ];
+
extraPkgs = pkgs: [ pkgs.libthai ];
extraInstallCommands =
let
-1
pkgs/development/embedded/arduino/arduino-core/chrootenv.nix
···
pyserial
]))
]);
-
multiArch = false;
extraInstallCommands = ''
${lib.optionalString withGui ''
-3
pkgs/development/web/bloomrpc/default.nix
···
export LC_ALL=C.UTF-8
'';
-
multiArch = false; # no 32bit needed
-
extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ];
-
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop
install -m 444 -D ${appimageContents}/${pname}.png \
+1 -4
pkgs/tools/misc/flexoptix-app/default.nix
···
inherit pname version;
src = appimageContents;
-
multiArch = false; # no 32bit needed
-
extraPkgs = { pkgs, ... }@args: [
-
pkgs.hidapi
-
] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
+
extraPkgs = pkgs: [ pkgs.hidapi ];
extraInstallCommands = ''
# Add desktop convencience stuff
+1 -1
pkgs/tools/security/buttercup-desktop/default.nix
···
in appimageTools.wrapType2 {
inherit pname src version;
-
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];
+
extraPkgs = pkgs: [ pkgs.libsecret ];
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/buttercup.desktop -t $out/share/applications