diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-05-20 13:20:53 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-05-20 13:20:53 +0200 |
commit | 392e6de7d0cc9a65a7fd195fd1304310a30a8489 (patch) | |
tree | fefd8ca07d3e2665a4746ac0fd43d0c7965d660e /pkgs/applications/version-management | |
parent | 90c01001396e166fabfbcfb955de2a5409a95d9b (diff) | |
parent | 68cdc9c09e38e704a3bed720fc182f1907035375 (diff) | |
download | nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.gz nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.bz2 nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.lz nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.xz nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.tar.zst nixlib-392e6de7d0cc9a65a7fd195fd1304310a30a8489.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-dit/default.nix | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 13b861d0a9ed..99b6b5313709 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -67,7 +67,9 @@ rec { git-crypt = callPackage ./git-crypt { }; - git-dit = callPackage ./git-dit { }; + git-dit = callPackage ./git-dit { + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; git-extras = callPackage ./git-extras { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 41096441b8e7..654576a29e80 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -8,6 +8,10 @@ , perl , pkgconfig , rustPlatform +, curl +, libiconv +, CoreFoundation +, Security }: with rustPlatform; @@ -35,6 +39,11 @@ buildRustPackage rec { openssl libssh zlib + ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + curl + libiconv + CoreFoundation + Security ]; meta = with stdenv.lib; { |