Commit 5e06b3cb authored by Alyssa Ross's avatar Alyssa Ross
Browse files

treewide: don't use rustPlatform.rust 

This will be deprecated in the next commit.
parent b22c35f0

doc/languages-frameworks/rust.section.md

+8 −5
Original line number Diff line number Diff line
@@ -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

  ];



  # ...

}

pkgs/applications/accessibility/contrast/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -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

  ];

pkgs/applications/accessibility/squeekboard/default.nix

+6 −5
Original line number Diff line number Diff line 
{ 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

pkgs/applications/audio/amberol/default.nix

+6 −5
Original line number Diff line number Diff line
@@ -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

pkgs/applications/audio/gnome-podcasts/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -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

  ];