diff options
Diffstat (limited to 'pkgs/development/tools')
4 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/development/tools/ashpd-demo/default.nix b/pkgs/development/tools/ashpd-demo/default.nix index 2103d74e072..c489eddd117 100644 --- a/pkgs/development/tools/ashpd-demo/default.nix +++ b/pkgs/development/tools/ashpd-demo/default.nix @@ -2,9 +2,11 @@ , lib , fetchFromGitHub , nix-update-script +, cargo , meson , ninja , rustPlatform +, rustc , pkg-config , glib , libshumate @@ -44,9 +46,9 @@ stdenv.mkDerivation rec { meson ninja pkg-config - rustPlatform.rust.cargo + cargo rustPlatform.cargoSetupHook - rustPlatform.rust.rustc + rustc wrapGAppsHook4 rustPlatform.bindgenHook desktop-file-utils diff --git a/pkgs/development/tools/build-managers/corrosion/default.nix b/pkgs/development/tools/build-managers/corrosion/default.nix index 0907923e6fc..e4084051fab 100644 --- a/pkgs/development/tools/build-managers/corrosion/default.nix +++ b/pkgs/development/tools/build-managers/corrosion/default.nix @@ -1,8 +1,10 @@ { lib , stdenv , fetchFromGitHub +, cargo , cmake , rustPlatform +, rustc , libiconv }: @@ -30,11 +32,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; meta = with lib; { description = "Tool for integrating Rust into an existing CMake project"; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix index 8e7bba4d00e..18631324057 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix @@ -212,7 +212,7 @@ lib.composeManyExtensions [ nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ lib.optionals (lib.versionAtLeast old.version "4") - (with pkgs.rustPlatform; [ rust.rustc rust.cargo cargoSetupHook self.setuptools-rust ]); + [ rustc cargo rustPlatform.cargoSetupHook self.setuptools-rust ]; } // lib.optionalAttrs (lib.versionAtLeast old.version "4") { cargoDeps = pkgs.rustPlatform.fetchCargoTarball @@ -402,7 +402,7 @@ lib.composeManyExtensions [ ++ lib.optionals (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ] ++ lib.optional (!self.isPyPy) pyBuildPackages.cffi ++ lib.optional (lib.versionAtLeast old.version "3.5" && !isWheel) - (with pkgs.rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]) + (with pkgs; [ rustPlatform.cargoSetupHook cargo rustc ]) ++ [ pkg-config ] ; buildInputs = (old.buildInputs or [ ]) diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index c68683dbecb..33db2dd144d 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -1,4 +1,5 @@ { boost +, cargo , cmake , config , CoreServices @@ -25,6 +26,7 @@ , pkg-config , python3 , rustPlatform +, rustc , stateDir ? "/tmp" , stdenv , wangle @@ -56,11 +58,10 @@ stdenv.mkDerivation rec { cmake pkg-config ensureNewerSourcesForZipFilesHook - ] ++ (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); + rustPlatform.cargoSetupHook + cargo + rustc + ]; buildInputs = [ pcre |