Skip to content

Commit f1ade01

Browse files
committed
build(nix): update nixify
Signed-off-by: Roman Volosatovs <[email protected]>
1 parent 0189833 commit f1ade01

File tree

2 files changed

+13
-37
lines changed

2 files changed

+13
-37
lines changed

flake.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -98,29 +98,12 @@
9898
pkgsCross ? pkgs,
9999
...
100100
}: {
101-
buildInputs ? [],
102-
depsBuildBuild ? [],
103-
nativeBuildInputs ? [],
104101
nativeCheckInputs ? [],
105102
preCheck ? "",
106103
...
107104
} @ 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) {
124107
preCheck =
125108
''
126109
export GOCACHE=$TMPDIR/gocache
@@ -130,13 +113,6 @@
130113
''
131114
+ preCheck;
132115

133-
depsBuildBuild =
134-
depsBuildBuild'
135-
++ optionals darwin2darwin [
136-
pkgs.darwin.apple_sdk.frameworks.CoreFoundation
137-
pkgs.darwin.apple_sdk.frameworks.CoreServices
138-
];
139-
140116
nativeCheckInputs =
141117
nativeCheckInputs
142118
++ [

0 commit comments

Comments
 (0)