diff options
Diffstat (limited to 'pkgs/applications/networking')
10 files changed, 12 insertions, 19 deletions
diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 96f7d250bccb6..a83742cf937cc 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -17,8 +17,6 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - meta = with lib; { description = "Sylk WebRTC client"; homepage = "https://sylkserver.com/"; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index e40ad508099ef..47d1cfe83bbf0 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -16,7 +16,7 @@ let in appimageTools.wrapType2 { inherit pname src version; - 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 diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/applications/networking/cluster/lens/linux.nix index b54285fdafcc6..c76a1607760da 100644 --- a/pkgs/applications/networking/cluster/lens/linux.nix +++ b/pkgs/applications/networking/cluster/lens/linux.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pname, version, src, meta, appimageTools, makeWrapper, nss_latest }: +{ pname, version, src, meta, appimageTools, makeWrapper }: let name = "${pname}-${version}"; @@ -25,5 +25,5 @@ appimageTools.wrapType2 { --replace 'Exec=AppRun' 'Exec=${pname}' ''; - extraPkgs = _: [ nss_latest ]; + extraPkgs = pkgs: [ pkgs.nss_latest ]; } diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 2d70e6a75ea7c..3651408c8b7fc 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -2,7 +2,6 @@ , stdenvNoCC , fetchurl , appimageTools -, libsecret , makeWrapper , writeShellApplication , curl @@ -19,7 +18,7 @@ let }; appimage = appimageTools.wrapType2 { inherit version pname src; - extraPkgs = pkgs: with pkgs; [ libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; }; appimageContents = appimageTools.extractType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix index cceea293adbd3..ed0e978c1524f 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix @@ -1,5 +1,4 @@ -{ lib -, fetchurl +{ fetchurl , appimageTools , xorg , pname @@ -27,8 +26,6 @@ in export LC_ALL=C.UTF-8 ''; - extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; - extraInstallCommands = '' mkdir -p $out/share "${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share" diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index af5f6ca321c03..d9deab388d78e 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -30,7 +30,7 @@ appimageTools.wrapType2 { 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"; diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix index 47cd45bfdd5b1..6823eaf016991 100644 --- a/pkgs/applications/networking/irc/irccloud/default.nix +++ b/pkgs/applications/networking/irc/irccloud/default.nix @@ -16,7 +16,7 @@ let 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 diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index acb7ebfbe61e4..bf40dba20861a 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, fetchurl, libsecret }: +{ appimageTools, lib, fetchurl }: let pname = "electron-mail"; @@ -20,9 +20,9 @@ in appimageTools.wrapType2 { 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; { diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index d82fe6652afef..44597be716a70 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -12,7 +12,7 @@ appimageTools.wrapType2 rec { 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; }; diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index 9caf0d23236d1..b3235ba5154f5 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -19,7 +19,6 @@ in appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - 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 \ |