From a69b5bf7ec4a402c6eff2f46d418f8f805a6f5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 30 Dec 2020 03:05:47 +0100 Subject: [PATCH] gitoxide: Fix build on darwin --- .../version-management/gitoxide/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index bdb3e4825b9..f7a17e510f4 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; - meta = with lib; { - description = - "A command-line application for interacting with git repositories"; + meta = with stdenv.lib; { + description = "A command-line application for interacting with git repositories"; homepage = "https://github.com/Byron/gitoxide"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.syberant ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b17319f106..ee98e83e9a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21720,7 +21720,9 @@ in gitolite = callPackage ../applications/version-management/gitolite { }; - gitoxide = callPackage ../applications/version-management/gitoxide { }; + gitoxide = callPackage ../applications/version-management/gitoxide { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (gnome3) gitg;