diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-01-01 03:28:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-01 03:28:03 +0100 |
| commit | eef90463b3478020bdfcefa5c0d718d3380e635d (patch) | |
| tree | 40506e28d6c3d8c2b1fe6cb863204f0e156e9c7c | |
| parent | 027b3b478eb2b62838acdfc0d3104842f235bdca (diff) | |
| parent | a69b5bf7ec4a402c6eff2f46d418f8f805a6f5ce (diff) | |
| download | nixlib-eef90463b3478020bdfcefa5c0d718d3380e635d.tar nixlib-eef90463b3478020bdfcefa5c0d718d3380e635d.tar.gz nixlib-eef90463b3478020bdfcefa5c0d718d3380e635d.tar.bz2 nixlib-eef90463b3478020bdfcefa5c0d718d3380e635d.tar.lz nixlib-eef90463b3478020bdfcefa5c0d718d3380e635d.tar.xz nixlib-eef90463b3478020bdfcefa5c0d718d3380e635d.tar.zst nixlib-eef90463b3478020bdfcefa5c0d718d3380e635d.zip | |
Merge pull request #107934 from SuperSandro2000/gitoxide-darwin
gitoxide: Fix build on darwin
| -rw-r--r-- | pkgs/applications/version-management/gitoxide/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index bdb3e4825b92..f7a17e510f4b 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5050331d61d..f7088cebdfe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |