1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00

git-branchless: fix build (#339023)

This commit is contained in:
Artturin 2024-09-09 19:38:32 +03:00 committed by GitHub
commit 4c6d87489d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,15 +1,16 @@
{ lib
, fetchFromGitHub
, git
, libiconv
, ncurses
, openssl
, pkg-config
, rustPlatform
, sqlite
, stdenv
, Security
, SystemConfiguration
{
lib,
fetchFromGitHub,
git,
libiconv,
ncurses,
openssl,
pkg-config,
rustPlatform,
sqlite,
stdenv,
Security,
SystemConfiguration,
}:
rustPlatform.buildRustPackage rec {
@ -27,15 +28,17 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
ncurses
openssl
sqlite
] ++ lib.optionals stdenv.isDarwin [
Security
SystemConfiguration
libiconv
];
buildInputs =
[
ncurses
openssl
sqlite
]
++ lib.optionals stdenv.isDarwin [
Security
SystemConfiguration
libiconv
];
postInstall = ''
$out/bin/git-branchless install-man-pages $out/share/man
@ -50,6 +53,23 @@ rustPlatform.buildRustPackage rec {
"--skip=test_switch_pty"
"--skip=test_next_ambiguous_interactive"
"--skip=test_switch_auto_switch_interactive"
"--skip=test_amend_undo"
"--skip=test_switch_pty"
"--skip=test_next_ambiguous_interactive"
"--skip=test_switch_auto_switch_interactive"
"--skip=test_move_branch_on_merge_conflict_resolution"
"--skip=test_move_branches_after_move"
"--skip=test_move_delete_checked_out_branch"
"--skip=test_move_no_reapply_squashed_commits"
"--skip=test_move_orphaned_root"
"--skip=test_restore_snapshot_basic"
"--skip=test_restore_snapshot_delete_file_only_in_index"
"--skip=test_restore_snapshot_deleted_files"
"--skip=test_sync_basic"
"--skip=test_sync_no_delete_main_branch"
"--skip=test_undo_doesnt_make_working_dir_dirty"
"--skip=test_undo_move_refs"
"--skip=test_undo_noninteractive"
];
meta = with lib; {
@ -57,6 +77,9 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/arxanas/git-branchless";
license = licenses.gpl2Only;
mainProgram = "git-branchless";
maintainers = with maintainers; [ nh2 hmenke ];
maintainers = with maintainers; [
nh2
hmenke
];
};
}