Skip to content

Commit

Permalink
build(nix): update nixify
Browse files Browse the repository at this point in the history
Signed-off-by: Roman Volosatovs <[email protected]>
  • Loading branch information
rvolosatovs committed Dec 2, 2024
1 parent 0189833 commit f1ade01
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 37 deletions.
22 changes: 11 additions & 11 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 2 additions & 26 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,29 +98,12 @@
pkgsCross ? pkgs,
...
}: {
buildInputs ? [],
depsBuildBuild ? [],
nativeBuildInputs ? [],
nativeCheckInputs ? [],
preCheck ? "",
...
} @ args:
with pkgs.lib; let
darwin2darwin = pkgs.stdenv.hostPlatform.isDarwin && pkgsCross.stdenv.hostPlatform.isDarwin;

depsBuildBuild' =
depsBuildBuild
++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
++ optional darwin2darwin pkgs.xcbuild.xcrun;
in
{
buildInputs =
buildInputs
++ optional pkgs.stdenv.hostPlatform.isDarwin pkgs.libiconv;

depsBuildBuild = depsBuildBuild';
}
// optionalAttrs (args ? cargoArtifacts) {
with pkgs.lib;
optionalAttrs (args ? cargoArtifacts) {
preCheck =
''
export GOCACHE=$TMPDIR/gocache
Expand All @@ -130,13 +113,6 @@
''
+ preCheck;

depsBuildBuild =
depsBuildBuild'
++ optionals darwin2darwin [
pkgs.darwin.apple_sdk.frameworks.CoreFoundation
pkgs.darwin.apple_sdk.frameworks.CoreServices
];

nativeCheckInputs =
nativeCheckInputs
++ [
Expand Down

0 comments on commit f1ade01

Please sign in to comment.