File tree Expand file tree Collapse file tree 1 file changed +14
-40
lines changed Expand file tree Collapse file tree 1 file changed +14
-40
lines changed Original file line number Diff line number Diff line change 37
37
} ;
38
38
} ) ;
39
39
40
- scm-diff-editor = final . callPackage
41
- (
42
- { lib
43
- , git
44
- , libiconv
45
- , ncurses
46
- , openssl
47
- , pkg-config
48
- , rustPlatform
49
- , sqlite
50
- , stdenv
51
- , Security
52
- , SystemConfiguration
53
- } :
54
-
55
- rustPlatform . buildRustPackage {
56
- name = "scm-diff-editor" ;
57
-
58
- src = self ;
59
-
60
- cargoLock = {
61
- lockFile = "${ self } /Cargo.lock" ;
62
- } ;
40
+ # reuse the definition for git-branchless
41
+ scm-diff-editor = final . git-branchless . overrideAttrs ( finalAttrs : prevAttrs : {
42
+ name = "scm-diff-editor" ;
43
+ meta = prevAttrs . meta // {
44
+ mainProgram = finalAttrs . name ;
45
+ description = "UI to interactively select changes, bundled in git-branchless" ;
46
+ } ;
63
47
64
- buildAndTestSubdir = "scm-record" ;
65
- buildFeatures = [ "scm-diff-editor" ] ;
66
- nativeBuildInputs = [ pkg-config ] ;
48
+ buildAndTestSubdir = "scm-record" ;
49
+ buildFeatures = [ "scm-diff-editor" ] ;
67
50
68
- buildInputs = [
69
- ncurses
70
- openssl
71
- sqlite
72
- ] ++ lib . optionals stdenv . isDarwin [
73
- Security
74
- SystemConfiguration
75
- libiconv
76
- ] ;
77
- }
78
- )
79
- {
80
- inherit ( final . darwin . apple_sdk . frameworks ) Security SystemConfiguration ;
81
- } ;
51
+ # remove the git-branchless specific build commands
52
+ postInstall = "" ;
53
+ preCheck = "" ;
54
+ checkFlags = "" ;
55
+ } ) ;
82
56
} ) ;
83
57
84
58
packages = foreachSystem ( system :
You can’t perform that action at this time.
0 commit comments