From 4515e8d15d38883fcbb818dc85710263bcb1cca8 Mon Sep 17 00:00:00 2001 From: Sam Willcocks Date: Wed, 6 Jul 2022 23:14:53 +0000 Subject: [PATCH] Add missing build dependencies to devshell. I assume these were knocking around in the system environment on my mac. --- flake.nix | 52 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/flake.nix b/flake.nix index 6193c09..49cb499 100644 --- a/flake.nix +++ b/flake.nix @@ -6,29 +6,41 @@ naersk.url = "github:nix-community/naersk"; rust-overlay.url = "github:oxalica/rust-overlay"; }; - outputs = { self, nixpkgs, utils, naersk, devshell, rust-overlay }: - utils.lib.eachDefaultSystem (system: - let - pkgs = import nixpkgs { inherit system; }; - naersk-lib = pkgs.callPackage naersk { }; - in - { - defaultPackage = naersk-lib.buildPackage ./.; + outputs = { + self, + nixpkgs, + utils, + naersk, + devshell, + rust-overlay, + }: + utils.lib.eachDefaultSystem (system: let + pkgs = import nixpkgs {inherit system;}; + naersk-lib = pkgs.callPackage naersk {}; + in { + defaultPackage = naersk-lib.buildPackage ./.; - defaultApp = utils.lib.mkApp { - drv = self.defaultPackage."${system}"; - }; - devShell = - let pkgs = import nixpkgs { + defaultApp = utils.lib.mkApp { + drv = self.defaultPackage."${system}"; + }; + devShells.default = let + pkgs = import nixpkgs { inherit system; - overlays = [ devshell.overlay (import rust-overlay)]; + overlays = [devshell.overlay (import rust-overlay)]; }; - in - pkgs.devshell.mkShell { - packages = with pkgs; [ dhall (rust-bin.stable.latest.default.override { - extensions = [ "rls" ]; - })]; + in + pkgs.mkShell { + buildInputs = with pkgs; [ + dhall + (rust-bin.stable.latest.default.override { + extensions = ["rls"]; + }) + pkg-config + libusb + openssl + ]; }; - }); + formatter = pkgs.alejandra; + }); }