diff options
82 files changed, 410 insertions, 287 deletions
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index a9a817201c17..7d46bdbd4d48 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -535,7 +535,9 @@ directory of the `tokenizers` project's source archive, we use ```nix { fetchFromGitHub , buildPythonPackage +, cargo , rustPlatform +, rustc , setuptools-rust }: @@ -558,11 +560,12 @@ buildPythonPackage rec { sourceRoot = "source/bindings/python"; - nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustc + setuptools-rust + ]; # ... } diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 9d3d568be2f6..7a7274d8d5e0 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitLab , cairo +, cargo , desktop-file-utils , gettext , glib @@ -12,6 +13,7 @@ , pango , pkg-config , rustPlatform +, rustc , wrapGAppsHook4 }: @@ -40,9 +42,9 @@ stdenv.mkDerivation rec { meson ninja pkg-config - rustPlatform.rust.cargo + cargo rustPlatform.cargoSetupHook - rustPlatform.rust.rustc + rustc wrapGAppsHook4 ]; diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 9e08d2380c18..0b58fb9c905d 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, cargo , meson , ninja , pkg-config @@ -14,6 +15,7 @@ , libxml2 , libxkbcommon , rustPlatform +, rustc , feedbackd , wrapGAppsHook , fetchpatch @@ -54,11 +56,10 @@ stdenv.mkDerivation rec { glib wayland wrapGAppsHook - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ gtk3 diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index 1c180269b687..68243713e1ee 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -2,12 +2,14 @@ , stdenv , fetchFromGitLab , rustPlatform +, cargo , desktop-file-utils , appstream-glib , meson , ninja , pkg-config , reuse +, rustc , m4 , wrapGAppsHook4 , glib @@ -48,11 +50,10 @@ stdenv.mkDerivation rec { reuse m4 wrapGAppsHook4 - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ glib diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index cf422133674a..b5889bcf63c8 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -3,11 +3,13 @@ , rustPlatform , fetchFromGitLab , fetchpatch +, cargo , meson , ninja , gettext , python3 , pkg-config +, rustc , glib , libhandy , gtk3 @@ -55,9 +57,9 @@ stdenv.mkDerivation rec { pkg-config gettext python3 - rustPlatform.rust.cargo + cargo rustPlatform.cargoSetupHook - rustPlatform.rust.rustc + rustc wrapGAppsHook glib ]; diff --git a/pkgs/applications/audio/helvum/default.nix b/pkgs/applications/audio/helvum/default.nix index 78891967fa41..c293c3384d57 100644 --- a/pkgs/applications/audio/helvum/default.nix +++ b/pkgs/applications/audio/helvum/default.nix @@ -1,4 +1,5 @@ { lib +, cargo , clang , desktop-file-utils , fetchFromGitLab @@ -11,6 +12,7 @@ , pipewire , pkg-config , rustPlatform +, rustc , stdenv }: @@ -38,8 +40,8 @@ stdenv.mkDerivation rec { ninja pkg-config rustPlatform.cargoSetupHook - rustPlatform.rust.cargo - rustPlatform.rust.rustc + cargo + rustc rustPlatform.bindgenHook ]; diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 917b54c08690..0da6acc242fa 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , appstream-glib +, cargo , dbus , desktop-file-utils , glib @@ -16,6 +17,7 @@ , ninja , pkg-config , rustPlatform +, rustc , wrapGAppsHook4 }: @@ -43,11 +45,10 @@ 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/audio/netease-cloud-music-gtk/default.nix b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix index b6a04cb934bf..8a83da7ff529 100644 --- a/pkgs/applications/audio/netease-cloud-music-gtk/default.nix +++ b/pkgs/applications/audio/netease-cloud-music-gtk/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , rustPlatform +, cargo , meson , ninja , pkg-config @@ -10,6 +11,7 @@ , appstream-glib , desktop-file-utils , libxml2 +, rustc , wrapGAppsHook4 , openssl , dbus @@ -47,11 +49,10 @@ stdenv.mkDerivation rec { desktop-file-utils # update-desktop-database libxml2 # xmllint wrapGAppsHook4 - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ openssl diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 807a27e67e1a..b64e4bf5e50e 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, cargo , dbus , desktop-file-utils , gdk-pixbuf @@ -15,6 +16,7 @@ , openssl , pkg-config , rustPlatform +, rustc , sqlite , wrapGAppsHook4 , cmake @@ -47,9 +49,9 @@ stdenv.mkDerivation rec { meson ninja pkg-config - rustPlatform.rust.cargo + cargo rustPlatform.cargoSetupHook - rustPlatform.rust.rustc + rustc wrapGAppsHook4 cmake ]; diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index e6c826e77f77..1935b3fcf22d 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -7,7 +7,9 @@ , gettext , python3 , desktop-file-utils +, cargo , rustPlatform +, rustc , pkg-config , glib , libadwaita @@ -45,9 +47,9 @@ stdenv.mkDerivation rec { gtk4 # for gtk-update-icon-cache glib # for glib-compile-schemas desktop-file-utils - rustPlatform.rust.cargo + cargo rustPlatform.cargoSetupHook - rustPlatform.rust.rustc + rustc wrapGAppsHook4 ]; diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index bb668867da14..284a992d3c3f 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -3,6 +3,7 @@ , fetchFromGitLab , rustPlatform , substituteAll +, cargo , desktop-file-utils , git , itstool @@ -10,6 +11,7 @@ , ninja , pkg-config , python3 +, rustc , wrapGAppsHook4 , borgbackup , gtk4 @@ -55,11 +57,10 @@ stdenv.mkDerivation rec { pkg-config python3 wrapGAppsHook4 - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ gtk4 diff --git a/pkgs/applications/graphics/emblem/default.nix b/pkgs/applications/graphics/emblem/default.nix index 0ec8a48f3c93..7afabcf6670d 100644 --- a/pkgs/applications/graphics/emblem/default.nix +++ b/pkgs/applications/graphics/emblem/default.nix @@ -3,11 +3,13 @@ , fetchFromGitLab , rustPlatform , appstream-glib +, cargo , desktop-file-utils , glib , meson , ninja , pkg-config +, rustc , wrapGAppsHook4 , gtk4 , libadwaita @@ -43,11 +45,10 @@ stdenv.mkDerivation rec { ninja pkg-config wrapGAppsHook4 - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ gtk4 diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index d088f633c3f3..d217ab9e47d2 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -2,12 +2,14 @@ , stdenv , fetchFromGitHub , rustPlatform +, cargo , pkg-config , meson , ninja , glib , gtk4 , libadwaita +, rustc , wrapGAppsHook4 , appstream-glib , desktop-file-utils @@ -37,11 +39,10 @@ stdenv.mkDerivation rec { wrapGAppsHook4 appstream-glib desktop-file-utils - ] ++ (with rustPlatform; [ - rust.cargo - rust.rustc - cargoSetupHook< |