diff options
| author | Christian Kögler <ck3d@gmx.de> | 2022-10-17 22:19:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-17 22:19:51 +0200 |
| commit | 3f6a5dc0f817143d957167f57158ddfa3dfa9a28 (patch) | |
| tree | cc1b59ca60fc31e4b3db3df9fd4e79a27581d303 /pkgs | |
| parent | c164f7c021e632614d0a95957cd4b3f795995dbf (diff) | |
| parent | 138543af5e66be0a7a25623baa08ec3a90baa7c5 (diff) | |
Merge pull request #196403 from viraptor/git-cinnabar-darwin
git-cinnabar: fix darwin build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix index df6a084bbd754..4141c6c1b6a46 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoconf, makeWrapper , curl, libiconv, mercurial, zlib +, CoreServices }: let @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoconf makeWrapper ]; - buildInputs = [ curl zlib ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ curl zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; # Ignore submodule status failing due to no git in environment. makeFlags = [ "SUBMODULE_STATUS=yes" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d20e18b5f4ce6..1fdfdcbea4171 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6945,7 +6945,9 @@ with pkgs; git-chglog = callPackage ../applications/version-management/git-and-tools/git-chglog { }; - git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { }; + git-cinnabar = callPackage ../applications/version-management/git-and-tools/git-cinnabar { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; git-cliff = callPackage ../applications/version-management/git-and-tools/git-cliff { inherit (darwin.apple_sdk.frameworks) Security; |