From 34dcb870de790ea69382c266630da173f8ef1a8b Mon Sep 17 00:00:00 2001 From: Aaron Kaiser Date: Tue, 15 Oct 2024 13:45:33 +0200 Subject: [PATCH] remove build dependency --- .gitignore | 1 + default.nix | 14 ++++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 8a24346..f4c37ae 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ proptest-regressions/ .idea/ result +.direnv/ diff --git a/default.nix b/default.nix index c0d7da0..2fb8c51 100644 --- a/default.nix +++ b/default.nix @@ -1,9 +1,4 @@ -{ pkgs ? import { - overlays = [ - (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) - ]; - } -}: +{ pkgs ? import { } }: with pkgs; let agent = callPackage "${fetchgit { @@ -18,10 +13,7 @@ rustPlatform.buildRustPackage name = "wireguard-agent"; src = nix-gitignore.gitignoreSource [ ] ./.; - nativeBuildInputs = [ - (rust-bin.fromRustupToolchainFile ./rust-toolchain.toml) - agent - ]; + nativeBuildInputs = [ agent ]; cargoLock = { lockFile = ./Cargo.lock; @@ -33,6 +25,8 @@ rustPlatform.buildRustPackage doCheck = false; + RUSTC_BOOTSTRAP = true; + AGENT_PATH = "${agent}/bin/agent_harness"; KEY_FILE = "keyfile"; RUST_LOG = "debug";