ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-05 20:11:43 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #196403 from viraptor/git-cinnabar-darwin

Browse Source 
git-cinnabar: fix darwin build
This commit is contained in:
Christian Kögler 2022-10-17 22:19:51 +02:00 committed by GitHub
commit 3f6a5dc0f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix
View File

@ -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" ];

4
pkgs/top-level/all-packages.nix
View File

@ -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;