cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #123155 from stephank/fix-gitoxide-darwin

Browse source 
gitoxide: fix darwin build
This commit is contained in:
Mario Rodas 2021-05-15 16:38:09 -05:00 committed by GitHub
commit 97abfb3349
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/version-management/gitoxide/default.nix
View file

@ -1,4 +1,5 @@
{ lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl, Security }: { lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl
, libiconv, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "gitoxide"; pname = "gitoxide";
@ -14,8 +15,9 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0gw19zdxbkgnj1kcyqn1naj1dnhsx10j860m0xgs5z7bbvfg82p6"; cargoSha256 = "0gw19zdxbkgnj1kcyqn1naj1dnhsx10j860m0xgs5z7bbvfg82p6";
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ openssl ] buildInputs = if stdenv.isDarwin
++ lib.optionals stdenv.isDarwin [ Security ]; then [ libiconv Security ]
else [ openssl ];
# Needed to get openssl-sys to use pkg-config. # Needed to get openssl-sys to use pkg-config.
OPENSSL_NO_VENDOR = 1; OPENSSL_NO_VENDOR = 1;