From c22ed12bbe3565437436d70a391efd7d774f5848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Nov 2024 06:53:33 +0100 Subject: [PATCH] Revert "nix-static: disable on macOS" This reverts commit e44d98b9381aff8f64c83d915847d2e3385b14f7. --- flake.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index a57473f0d..9bd33d3ae 100644 --- a/flake.nix +++ b/flake.nix @@ -265,10 +265,9 @@ (pkgName: { supportsCross ? true }: { # These attributes go right into `packages.`. "${pkgName}" = nixpkgsFor.${system}.native.nixComponents.${pkgName}; - # evaluation error on boost in nixpkgs on macOS - } // lib.optionalAttrs (!nixpkgsFor.${system}.native.stdenv.hostPlatform.isDarwin) { "${pkgName}-static" = nixpkgsFor.${system}.static.nixComponents.${pkgName}; - } // lib.optionalAttrs supportsCross (flatMapAttrs (lib.genAttrs crossSystems (_: { })) (crossSystem: {}: { + } + // lib.optionalAttrs supportsCross (flatMapAttrs (lib.genAttrs crossSystems (_: { })) (crossSystem: {}: { # These attributes go right into `packages.`. "${pkgName}-${crossSystem}" = nixpkgsFor.${system}.cross.${crossSystem}.nixComponents.${pkgName}; }))