File tree Expand file tree Collapse file tree 2 files changed +13
-37
lines changed Expand file tree Collapse file tree 2 files changed +13
-37
lines changed Original file line number Diff line number Diff line change 98
98
pkgsCross ? pkgs ,
99
99
...
100
100
} : {
101
- buildInputs ? [ ] ,
102
- depsBuildBuild ? [ ] ,
103
- nativeBuildInputs ? [ ] ,
104
101
nativeCheckInputs ? [ ] ,
105
102
preCheck ? "" ,
106
103
...
107
104
} @ args :
108
- with pkgs . lib ; let
109
- darwin2darwin = pkgs . stdenv . hostPlatform . isDarwin && pkgsCross . stdenv . hostPlatform . isDarwin ;
110
-
111
- depsBuildBuild' =
112
- depsBuildBuild
113
- ++ optional pkgs . stdenv . hostPlatform . isDarwin pkgs . darwin . apple_sdk . frameworks . SystemConfiguration
114
- ++ optional darwin2darwin pkgs . xcbuild . xcrun ;
115
- in
116
- {
117
- buildInputs =
118
- buildInputs
119
- ++ optional pkgs . stdenv . hostPlatform . isDarwin pkgs . libiconv ;
120
-
121
- depsBuildBuild = depsBuildBuild' ;
122
- }
123
- // optionalAttrs ( args ? cargoArtifacts ) {
105
+ with pkgs . lib ;
106
+ optionalAttrs ( args ? cargoArtifacts ) {
124
107
preCheck =
125
108
''
126
109
export GOCACHE=$TMPDIR/gocache
130
113
''
131
114
+ preCheck ;
132
115
133
- depsBuildBuild =
134
- depsBuildBuild'
135
- ++ optionals darwin2darwin [
136
- pkgs . darwin . apple_sdk . frameworks . CoreFoundation
137
- pkgs . darwin . apple_sdk . frameworks . CoreServices
138
- ] ;
139
-
140
116
nativeCheckInputs =
141
117
nativeCheckInputs
142
118
++ [
You can’t perform that action at this time.
0 commit comments