nix: Move back to versioned rust-bin

Xetibo · Jun 3, 2024 · 003f6c0 · 003f6c0
1 parent ccd39d3
commit 003f6c0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 19 deletions.
diff --git a/.direnv/flake-profile b/.direnv/flake-profile
@@ -1 +1 @@
-flake-profile-4-link
+flake-profile-5-link
diff --git a/.direnv/flake-profile-4-link b/.direnv/flake-profile-4-link
diff --git a/.direnv/flake-profile-5-link b/.direnv/flake-profile-5-link
@@ -0,0 +1 @@
+/nix/store/7xjfqyrvi0kbpxnm4ys31xgn1f89wg56-nix-shell-env
diff --git a/nix/keyboard.nix b/nix/keyboard.nix
@@ -8,10 +8,6 @@
 , dbus
 , xorg
 , pulseaudio
-, cargo
-, rust-analyzer
-, rustc
-, clippy
 , lib
 , ...
 }:
@@ -45,18 +41,15 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook4
-    cargo
-    rustc
-    rust-analyzer
-    clippy
+    rust-bin.nightly."2024-05-10".default
   ];
 
   copyLibs = true;
 
   postInstall = ''
     mkdir -p $HOME/.config/reset
     mkdir -p $HOME/.config/reset/plugins
-    ln -sf $out/target/release/lib${pname}.so $HOME/.config/reset/plugins/.
+    ln -sf $out/target/release/lib${pname}_plugin.so $HOME/.config/reset/plugins/.
   '';
 
   meta = with lib; {

diff --git a/nix/monitor.nix b/nix/monitor.nix
@@ -7,10 +7,6 @@
 , libadwaita
 , dbus
 , pulseaudio
-, cargo
-, rust-analyzer
-, rustc
-, clippy
 , lib
 , ...
 }:
@@ -46,10 +42,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook4
-    cargo
-    rustc
-    rust-analyzer
-    clippy
+    rust-bin.nightly."2024-05-10".default
   ];
 
   copyLibs = true;