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

Merge pull request #107934 from SuperSandro2000/gitoxide-darwin

Browse Source 
gitoxide: Fix build on darwin
This commit is contained in:
Sandro 2021-01-01 03:28:03 +01:00 committed by GitHub
commit eef90463b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
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 ];

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

@ -21750,7 +21750,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;