git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107934 from SuperSandro2000/gitoxide-darwin

gitoxide: Fix build on darwin

commiteef90463b3478020bdfcefa5c0d718d3380e635d authorSandro <sandro.jaeckel@gmail.com> dateFri 1 Jan 2021, 03:28 (6 years ago) parent027b3b4a69b5bf
2 files changed+8−6
pkgs/applications/version-management/gitoxide/default.nix+5−5 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/version-management/gitoxide/default.nix+5−5
@@ -1,4 +1,4 @@
1−{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }:
1+{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "gitoxide";
@@ -14,14 +14,14 @@ rustPlatform.buildRustPackage rec {
1414 cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU=";
1515
1616 nativeBuildInputs = [ pkg-config ];
17− buildInputs = [ openssl ];
17+ buildInputs = [ openssl ]
18+ ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
1819
1920 # Needed to get openssl-sys to use pkgconfig.
2021 OPENSSL_NO_VENDOR = 1;
2122
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";
2525 homepage = "https://github.com/Byron/gitoxide";
2626 license = with licenses; [ mit /* or */ asl20 ];
2727 maintainers = [ maintainers.syberant ];
pkgs/top-level/all-packages.nix+3−1
@@ -21750,7 +21750,9 @@ in
2175021750
2175121751 gitolite = callPackage ../applications/version-management/gitolite { };
2175221752
21753− gitoxide = callPackage ../applications/version-management/gitoxide { };
21753+ gitoxide = callPackage ../applications/version-management/gitoxide {
21754+ inherit (darwin.apple_sdk.frameworks) Security;
21755+ };
2175421756
2175521757 inherit (gnome3) gitg;
2175621758