From 78994deb1ea37ef748d194f28a2701aadc2fcabe Mon Sep 17 00:00:00 2001 From: strawberry Date: Sun, 12 May 2024 01:13:23 -0400 Subject: [PATCH] nix: simplify isDarwin lib check Signed-off-by: strawberry --- nix/pkgs/main/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nix/pkgs/main/default.nix b/nix/pkgs/main/default.nix index 3829bfd8..f546a328 100644 --- a/nix/pkgs/main/default.nix +++ b/nix/pkgs/main/default.nix @@ -66,11 +66,14 @@ commonAttrs = { # right thing here. pkgsBuildHost.rustPlatform.bindgenHook ] + ++ lib.optionals stdenv.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/206242 - ++ lib.optionals stdenv.isDarwin [ libiconv ] + libiconv + # https://stackoverflow.com/questions/69869574/properly-adding-darwin-apple-sdk-to-a-nix-shell # https://discourse.nixos.org/t/compile-a-rust-binary-on-macos-dbcrossbar/8612 - ++ lib.optionals stdenv.isDarwin [ pkgsBuildHost.darwin.apple_sdk.frameworks.Security ]; + pkgsBuildHost.darwin.apple_sdk.frameworks.Security + ]; }; in