mirror of
https://github.com/NixOS/nix.git
synced 2024-11-21 22:32:26 +00:00
Revert "nix-static: disable on macOS"
This reverts commit e44d98b9381aff8f64c83d915847d2e3385b14f7.
This commit is contained in:
parent
c7bf78054a
commit
c22ed12bbe
@ -265,10 +265,9 @@
|
||||
(pkgName: { supportsCross ? true }: {
|
||||
# These attributes go right into `packages.<system>`.
|
||||
"${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.<system>`.
|
||||
"${pkgName}-${crossSystem}" = nixpkgsFor.${system}.cross.${crossSystem}.nixComponents.${pkgName};
|
||||
}))
|
||||
|
Loading…
Reference in New Issue
Block a user