From 65565a42050a4260445698b95f5caf0f950e1d15 Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Sat, 11 Jan 2025 11:59:56 -0800 Subject: [PATCH] nix: override rustPlatform instead of using makeRustPlatform --- flake.nix | 6 ++++-- package.nix | 7 ++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 2038a1d..222c71c 100644 --- a/flake.nix +++ b/flake.nix @@ -33,8 +33,10 @@ packages.default = let rust-bin = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal); in pkgs.callPackage ./package.nix { - cargo = rust-bin; - rustc = rust-bin; + rustPlatform = pkgs.makeRustPlatform { + rustc = rust-bin; + cargo = rust-bin; + }; }; }; }; diff --git a/package.nix b/package.nix index 71e9ba2..0a30744 100644 --- a/package.nix +++ b/package.nix @@ -1,6 +1,4 @@ -{ makeRustPlatform -, cargo -, rustc +{ rustPlatform # Runtime Deps , sqlite @@ -10,8 +8,7 @@ , pkg-config }: -let rustPlatform = makeRustPlatform { inherit cargo rustc; }; -in rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage { pname = "nyazoom"; version = "0.1.0";