mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-20 04:33:57 +00:00
Merge pull request #123155 from stephank/fix-gitoxide-darwin
gitoxide: fix darwin build
This commit is contained in:
commit
97abfb3349
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user