about summary refs log tree commit diff
path: root/shells
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-03-06 19:22:41 +0000
committerAlyssa Ross <hi@alyssa.is>2022-03-16 11:38:56 +0000
commita8ca1f9583d6af07ce182cd2cf038fff76f848ee (patch)
tree9aed0f3fb49d9dfe1f34378adbe4dbde5eeee95d /shells
parentd435710923ac6e6f9fc155534800745004f2ce93 (diff)
downloadnixlib-a8ca1f9583d6af07ce182cd2cf038fff76f848ee.tar
nixlib-a8ca1f9583d6af07ce182cd2cf038fff76f848ee.tar.gz
nixlib-a8ca1f9583d6af07ce182cd2cf038fff76f848ee.tar.bz2
nixlib-a8ca1f9583d6af07ce182cd2cf038fff76f848ee.tar.lz
nixlib-a8ca1f9583d6af07ce182cd2cf038fff76f848ee.tar.xz
nixlib-a8ca1f9583d6af07ce182cd2cf038fff76f848ee.tar.zst
nixlib-a8ca1f9583d6af07ce182cd2cf038fff76f848ee.zip
shells/rust: move tools to nativeBuildInputs
This is important for when pkgs is a cross package set.
Diffstat (limited to 'shells')
-rw-r--r--shells/rust.nix15
1 files changed, 9 insertions, 6 deletions
diff --git a/shells/rust.nix b/shells/rust.nix
index 74eafd4f3aaa..8bc6538bc4e1 100644
--- a/shells/rust.nix
+++ b/shells/rust.nix
@@ -1,17 +1,20 @@
-{ pkgs ? import ../. {} }:
-with pkgs;
+{ pkgs ? import ../. {} }: pkgs.callPackage (
+{ stdenv, cargo, cargo-deny, cargo-edit, clang, clippy, llvmPackages, pkg-config
+, rust-analyzer, rustPlatform, rustc, rustfmt,
+}:
 
 stdenv.mkDerivation {
   name = "rust-shell";
-  buildInputs = [
-    cargo cargo-deny cargo-edit clang clippy llvm pkg-config rust-analyzer rustc
-    rustfmt
+  nativeBuildInputs = [
+    cargo cargo-deny cargo-edit clang clippy llvmPackages.llvm pkg-config
+    rust-analyzer rustPlatform.cargoBuildHook rustc rustfmt
   ];
 
   buildCommand = ''
-    printf "%s\n" $buildInputs > $out
+    env > $out
   '';
 
   # For bindgen
   LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
 }
+) { }