public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitoxide: Fix build on darwin

Browse Source
This commit is contained in:
Sandro Jäckel 2020-12-30 03:05:47 +01:00
parent 3c08a64b7d
commit a69b5bf7ec
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/version-management/gitoxide/default.nix
View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: { stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitoxide"; pname = "gitoxide";
@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU="; cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU=";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]; buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
# Needed to get openssl-sys to use pkgconfig. # Needed to get openssl-sys to use pkgconfig.
OPENSSL_NO_VENDOR = 1; OPENSSL_NO_VENDOR = 1;
meta = with lib; { meta = with stdenv.lib; {
description = description = "A command-line application for interacting with git repositories";
"A command-line application for interacting with git repositories";
homepage = "https://github.com/Byron/gitoxide"; homepage = "https://github.com/Byron/gitoxide";
license = with licenses; [ mit /* or */ asl20 ]; license = with licenses; [ mit /* or */ asl20 ];
maintainers = [ maintainers.syberant ]; maintainers = [ maintainers.syberant ];

4
pkgs/top-level/all-packages.nix
View File

@ -21720,7 +21720,9 @@ in
gitolite = callPackage ../applications/version-management/gitolite { }; 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; inherit (gnome3) gitg;