diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml index a34fe9e..fc5a09a 100644 --- a/.github/workflows/binaries.yml +++ b/.github/workflows/binaries.yml @@ -50,9 +50,8 @@ jobs: run: | sudo apt-get -q -y update sudo apt-get -q -y install qemu-user-static - echo "extra-platforms = aarch64" | sudo tee -a /etc/nix/nix.conf - name: Build and pin final output run: | - nix build .#static-bins + nix --extra-platforms aarch64-linux build .#static-bins cachix push nix-wrap $(nix eval --raw .#static-bins) cachix pin nix-wrap binaries $(nix eval --raw .#static-bins) --keep-forever diff --git a/static-bins/nixpkgs-darwin-static.nix b/static-bins/nixpkgs-darwin-static.nix index 984e38d..f7738d5 100644 --- a/static-bins/nixpkgs-darwin-static.nix +++ b/static-bins/nixpkgs-darwin-static.nix @@ -1,6 +1,10 @@ self: super: { libcCross = super.buildPackages.darwin.Libsystem; + darwin = super.darwin // { + apple_sdk = super.buildPackages.darwin.apple_sdk; + }; + #targetPackages = super.targetPackages // { # libcCross = self.libcCross; # darwin = self.darwin; @@ -11,12 +15,6 @@ self: super: # Setting this prevents static libc++ from being used targetPackages = self; - # Workaround for nixos/nixpkgs#127345 - boost = super.boost.overrideAttrs(o: { - buildPhase = builtins.replaceStrings ["binary-format=macho"] ["binary-format=mach-o"] o.buildPhase; - installPhase = builtins.replaceStrings ["binary-format=macho"] ["binary-format=mach-o"] o.installPhase; - }); - nixStatic = self.nix.overrideAttrs (o: rec { nix_LDFLAGS = "-nodefaultlibs -nostdlib ${super.pkgsBuildBuild.libcxx}/lib/libc++.a ${super.pkgsBuildBuild.libcxx}/lib/libc++experimental.a ${super.pkgsBuildBuild.libcxxabi}/lib/libc++abi.a -lSystem"; postConfigure = '' @@ -24,4 +22,5 @@ self: super: sed -e 's,nix_LDFLAGS =,nix_LDFLAGS = ${nix_LDFLAGS},' src/nix/local.mk -i ''; }); + }