From 7f9731f8a8022b36e5ac7b499af8c0df5c420d00 Mon Sep 17 00:00:00 2001 From: gavinleroy Date: Sat, 24 Aug 2024 22:14:24 -0400 Subject: [PATCH] Add pkgs-config to native build inputs --- flake.nix | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/flake.nix b/flake.nix index d3fa8d7..af564a8 100644 --- a/flake.nix +++ b/flake.nix @@ -59,8 +59,11 @@ cargo test ''; in { - devShell = pkgs.mkShell { - buildInputs = [ checkProject ] ++ (with pkgs; [ + devShell = with pkgs; mkShell { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + checkProject + llvmPackages_latest.llvm llvmPackages_latest.lld @@ -86,30 +89,11 @@ ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ] ++ lib.optionals stdenv.isLinux [ - # Libraries needed in testing alsa-lib.dev udev.dev - ]); + ]; - RUSTC_LINKER = "${pkgs.llvmPackages.clangUseLLVM}/bin/clang"; + RUSTC_LINKER = "${llvmPackages.clangUseLLVM}/bin/clang"; }; - - # packages = rec { - # default = cargo-argus; - - # cargo-argus = pkgs.rustPlatform.buildRustPackage { - # pname = name; - # inherit version; - # src = ./.; - # cargoSha256 = pkgs.lib.fakeHash; - # release = true; - # }; - - # # TODO package and release tutorial with nix - # # argus-tutorial = {}; - - # # TODO package and release extension with nix - # # vscode-argus = {}; - # }; }); }