git-trim: fix build on darwin
This commit is contained in:
@@ -1,4 +1,14 @@
|
|||||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, rustPlatform
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, openssl
|
||||||
|
, libgit2
|
||||||
|
, IOKit
|
||||||
|
, CoreFoundation
|
||||||
|
, fetchpatch
|
||||||
|
}:
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "git-trim";
|
pname = "git-trim";
|
||||||
@@ -11,11 +21,22 @@ rustPlatform.buildRustPackage rec {
|
|||||||
sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM=";
|
sha256 = "sha256-XAO3Qg5I2lYZVNx4+Z5jKHRIFdNwBJsUQwJXFb4CbvM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoHash = "sha256-KCLMb8NXxjscrmKXkP/RbV+LsJqOG7zaClJGFiQ4o9k=";
|
cargoHash = "sha256-mS8kNkZs8jX99ryG4XkU+U/iWIIcmET2vOfG1YNNZFU=";
|
||||||
|
|
||||||
|
cargoPatches = [
|
||||||
|
# Update git2 https://github.com/foriequal0/git-trim/pull/202
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/foriequal0/git-trim/commit/4355cd1d6f605455087c4d7ad16bfb92ffee941f.patch";
|
||||||
|
sha256 = "sha256-C1pX4oe9ZCgvqYTBJeSjMdr0KFyjv2PNVMJDlwCAngY=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
OPENSSL_NO_VENDOR = 1;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
|
buildInputs = [ openssl libgit2 ]
|
||||||
|
++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -Dm644 -t $out/share/man/man1/ docs/git-trim.1
|
install -Dm644 -t $out/share/man/man1/ docs/git-trim.1
|
||||||
|
|||||||
@@ -1912,7 +1912,7 @@ with pkgs;
|
|||||||
git-town = callPackage ../applications/version-management/git-town { };
|
git-town = callPackage ../applications/version-management/git-town { };
|
||||||
|
|
||||||
git-trim = callPackage ../applications/version-management/git-trim {
|
git-trim = callPackage ../applications/version-management/git-trim {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk_11_0.frameworks) IOKit CoreFoundation;
|
||||||
};
|
};
|
||||||
|
|
||||||
git-up = callPackage ../applications/version-management/git-up {
|
git-up = callPackage ../applications/version-management/git-up {
|
||||||
|
|||||||
Reference in New Issue
Block a user