Merge pull request #107934 from SuperSandro2000/gitoxide-darwin

gitoxide: Fix build on darwin

authored by

Sandro and committed by
GitHub
eef90463 027b3b47

+8 -6
+5 -5
pkgs/applications/version-management/gitoxide/default.nix
··· 1 - { lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: 1 + { stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "gitoxide"; ··· 14 14 cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU="; 15 15 16 16 nativeBuildInputs = [ pkg-config ]; 17 - buildInputs = [ openssl ]; 17 + buildInputs = [ openssl ] 18 + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; 18 19 19 20 # Needed to get openssl-sys to use pkgconfig. 20 21 OPENSSL_NO_VENDOR = 1; 21 22 22 - meta = with lib; { 23 - description = 24 - "A command-line application for interacting with git repositories"; 23 + meta = with stdenv.lib; { 24 + description = "A command-line application for interacting with git repositories"; 25 25 homepage = "https://github.com/Byron/gitoxide"; 26 26 license = with licenses; [ mit /* or */ asl20 ]; 27 27 maintainers = [ maintainers.syberant ];
+3 -1
pkgs/top-level/all-packages.nix
··· 21750 21750 21751 21751 gitolite = callPackage ../applications/version-management/gitolite { }; 21752 21752 21753 - gitoxide = callPackage ../applications/version-management/gitoxide { }; 21753 + gitoxide = callPackage ../applications/version-management/gitoxide { 21754 + inherit (darwin.apple_sdk.frameworks) Security; 21755 + }; 21754 21756 21755 21757 inherit (gnome3) gitg; 21756 21758