magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

possibly fix macOS builds for nix

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
AwesomeQubic 2024-04-19 23:21:07 -04:00 • committed by June
parent 6c0d527b90
commit 999cc7ccf5
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -66,12 +66,14 @@
builder = pkgs: builder = pkgs:
((crane.mkLib pkgs).overrideToolchain toolchain).buildPackage; ((crane.mkLib pkgs).overrideToolchain toolchain).buildPackage;
nativeBuildInputs = pkgs: [ nativeBuildInputs = pkgs: let
darwin = if pkgs.stdenv.isDarwin then [ pkgs.libiconv ] else [];
in [
# bindgen needs the build platform's libclang. Apparently due to # bindgen needs the build platform's libclang. Apparently due to
# "splicing weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't # "splicing weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't
# quite do the right thing here. # quite do the right thing here.
pkgs.pkgsBuildHost.rustPlatform.bindgenHook pkgs.pkgsBuildHost.rustPlatform.bindgenHook
]; ] ++ darwin;
env = pkgs: { env = pkgs: {
CONDUIT_VERSION_EXTRA = self.shortRev or self.dirtyShortRev; CONDUIT_VERSION_EXTRA = self.shortRev or self.dirtyShortRev;