diff options
Diffstat (limited to 'pkgs/applications/networking')
6 files changed, 32 insertions, 24 deletions
diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 9af205735ac81..f3658c5e3507a 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -2,9 +2,11 @@ , stdenv , rustPlatform , fetchFromGitLab +, cargo , meson , ninja , pkg-config +, rustc , wrapGAppsHook4 , gdk-pixbuf , glib @@ -65,11 +67,10 @@ stdenv.mkDerivation (finalAttrs: { # Provides glib-compile-resources to compile gresources glib - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ gtk4 diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index 2cc643439b809..5c5ba1f8314bb 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, cargo , meson , ninja , pkg-config @@ -8,6 +9,7 @@ , libsecret , libadwaita , rustPlatform +, rustc , desktop-file-utils , wrapGAppsHook4 }: @@ -40,11 +42,10 @@ stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook4 - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ libadwaita diff --git a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix index 3a2d5da373d67..d3f2ac094411d 100644 --- a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -1,9 +1,11 @@ { stdenv , lib , fetchFromGitLab +, cargo , meson , ninja , rustPlatform +, rustc , pkg-config , glib , gtk4 @@ -49,8 +51,8 @@ stdenv.mkDerivation rec { pkg-config rustPlatform.bindgenHook rustPlatform.cargoSetupHook - rustPlatform.rust.cargo - rustPlatform.rust.rustc + cargo + rustc desktop-file-utils appstream-glib wrapGAppsHook4 diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 6646c96e3ea6c..4f92ce733e547 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -2,11 +2,13 @@ , lib , fetchFromGitLab , nix-update-script +, cargo , meson , ninja , gettext , python3 , rustPlatform +, rustc , pkg-config , gtksourceview4 , glib @@ -49,9 +51,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - rustPlatform.rust.cargo + cargo rustPlatform.cargoSetupHook - rustPlatform.rust.rustc + rustc wrapGAppsHook glib ]; diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/applications/networking/p2p/fragments/default.nix index 932cfbbbe3a20..da74fd5e60acb 100644 --- a/pkgs/applications/networking/p2p/fragments/default.nix +++ b/pkgs/applications/networking/p2p/fragments/default.nix @@ -3,6 +3,7 @@ , fetchFromGitLab , fetchpatch , appstream-glib +, cargo , dbus , desktop-file-utils , git @@ -14,6 +15,7 @@ , openssl , pkg-config , rustPlatform +, rustc , sqlite , transmission , wrapGAppsHook4 @@ -56,11 +58,10 @@ in stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook4 - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ dbus diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index 81e4c393851fc..f30b10e99c7b2 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitLab , appstream-glib +, cargo , desktop-file-utils , itstool , meson @@ -9,6 +10,7 @@ , pkg-config , python3 , rustPlatform +, rustc , wrapGAppsHook4 , glib , gtk4 @@ -46,11 +48,10 @@ stdenv.mkDerivation rec { pkg-config python3 wrapGAppsHook4 - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ glib |