From 6b21c56b58f3b4a2883dd8796ecbd953df47a3dd Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Thu, 4 Apr 2024 11:01:01 -0700 Subject: [PATCH] Add pkg-config --- nix/packages/git-gr.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/nix/packages/git-gr.nix b/nix/packages/git-gr.nix index 90356a6..5e6e266 100644 --- a/nix/packages/git-gr.nix +++ b/nix/packages/git-gr.nix @@ -10,6 +10,8 @@ rust-analyzer, cargo-release, installShellFiles, + pkg-config, + openssl, }: let inherit (inputs) crane advisory-db; craneLib = crane.lib.${system}; @@ -24,13 +26,19 @@ commonArgs' = { inherit src; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - (libiconv.override { - enableStatic = true; - enableShared = false; - }) - darwin.apple_sdk.frameworks.CoreServices - ]; + nativeBuildInputs = + lib.optionals stdenv.isLinux [ + pkg-config + openssl + ] + ++ lib.optionals stdenv.isDarwin [ + (libiconv.override { + enableStatic = true; + enableShared = false; + }) + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration + ]; }; # Build *just* the cargo dependencies, so we can reuse