flake: fix Darwin build
None of this stuff is necessary these days. This will produce an executable linking against a Nix store `libiconv`, but as the build isn’t static to begin with that should be fine. If a static build is required in the future, `pkgsStatic` can be used as it is in the `nix-installer` flake.
This commit is contained in:
parent
a5c0301ee8
commit
f5504c8285
|
@ -51,12 +51,7 @@
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
inputs.nix.packages.${final.stdenv.system}.default
|
inputs.nix.packages.${final.stdenv.system}.default
|
||||||
final.boost
|
final.boost
|
||||||
] ++ final.lib.optionals final.stdenv.isDarwin [
|
|
||||||
final.darwin.apple_sdk.frameworks.SystemConfiguration
|
|
||||||
(final.libiconv.override { enableStatic = true; enableShared = false; })
|
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_LINK = final.lib.optionalString final.stdenv.isDarwin "-lc++abi";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
|
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
|
||||||
|
@ -123,12 +118,8 @@
|
||||||
bacon
|
bacon
|
||||||
|
|
||||||
age
|
age
|
||||||
] ++ lib.optionals pkgs.stdenv.isDarwin [
|
|
||||||
libiconv
|
|
||||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_LINK = lib.optionalString pkgs.stdenv.isDarwin "-lc++abi";
|
|
||||||
RUST_SRC_PATH = "${pkgs.rustPlatform.rustcSrc}/library";
|
RUST_SRC_PATH = "${pkgs.rustPlatform.rustcSrc}/library";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue