From 4d38dd872ae39d3faa34afafc7edc34dbf8ad4c1 Mon Sep 17 00:00:00 2001 From: Nathan Perry Date: Sat, 23 Jan 2021 04:19:38 -0500 Subject: modulo naersk issue, it builds --- .envrc | 3 +++ flake.nix | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 .envrc diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..cee480e --- /dev/null +++ b/.envrc @@ -0,0 +1,3 @@ +watch_file flake.nix +eval "$(nix print-dev-env .#)" + diff --git a/flake.nix b/flake.nix index 4d9d8e4..76207cf 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,13 @@ inherit (pkgs) cargo rustc; }); + deps = with pkgs; [ + openssl + pkgconfig + libopus + postgresql + ]; + pkg = naersk.buildPackage { pname = "thulani"; version = self.rev or "dirty"; @@ -53,16 +60,15 @@ cargoBuildOptions = old: old ++ [ "--offline" ]; - buildInputs = [ - ]; + buildInputs = deps; }; in { devShell = pkgs.mkShell { - buildInputs = with pkgs; [ + buildInputs = (with pkgs; [ cargo rustc - ]; + ]) ++ deps; }; defaultPackage = pkg; -- cgit v1.3.1