Merge pull request #143 from DeterminateSystems/revert-140-fix-macos-…

…build Revert "Fix macOS build"
DeterminateSystems · Jun 17, 2024 · 3434625 · 3434625
2 parents 72d1774 + f9e1536
commit 3434625
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 104 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -16,12 +16,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: DeterminateSystems/flake-checker-action@main
-
       - uses: DeterminateSystems/nix-installer-action@main
 
       - uses: DeterminateSystems/magic-nix-cache-action@main
 
+      - uses: DeterminateSystems/flake-checker-action@main
+
       - name: "Nix formatting"
         run: git ls-files '*.nix' | nix develop --command xargs nixpkgs-fmt --check
 
@@ -32,7 +32,7 @@ jobs:
         run: nix develop --command cargo clippy --all-targets --all-features --  -Dwarnings
 
       - name: "Nix Flake Check"
-        run: nix flake check --all-systems --print-build-logs
+        run: nix flake check --print-build-logs
 
       - name: Build package
         run: "nix build .# -L --fallback"
@@ -44,23 +44,3 @@ jobs:
           name: flakehub-push-X64-Linux
           path: result/bin/flakehub-push
           retention-days: 1
-
-  # For local development purposes
-  build-artifacts-macos:
-    runs-on: ${{ matrix.systems.runner }}
-    strategy:
-      matrix:
-        systems:
-          - nix-system: aarch64-darwin
-            runner: macos-latest-xlarge
-          - nix-system: x86_64-darwin
-            runner: macos-12
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: DeterminateSystems/nix-installer-action@main
-
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-
-      - name: Build package
-        run: "nix build .# -L --fallback"
diff --git a/.prettierignore b/.prettierignore
@@ -1,4 +1,3 @@
 /dist
 /src
 pnpm-lock.yaml
-flake.lock
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -7,8 +7,8 @@
       url = "https://flakehub.com/f/ipetkov/crane/0.14.1.tar.gz";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    fenix = {
-      url = "https://flakehub.com/f/nix-community/fenix/0.1.1885.tar.gz";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -24,50 +24,42 @@
         inherit system;
         pkgs = import inputs.nixpkgs {
           inherit system;
-          overlays = [ inputs.self.overlays.default ];
+          overlays = [
+            inputs.self.overlays.default
+            inputs.rust-overlay.overlays.default
+          ];
         };
+        lib = pkgs.lib;
       });
     in
     {
-      overlays.default = final: prev: rec {
-        system = final.stdenv.hostPlatform.system;
-
-        rustToolchain = with inputs.fenix.packages.${system};
-          combine ([
-            stable.clippy
-            stable.rustc
-            stable.cargo
-            stable.rustfmt
-            stable.rust-src
-          ] ++ final.lib.optionals (system == "x86_64-linux") [
-            targets.x86_64-unknown-linux-musl.stable.rust-std
-          ] ++ final.lib.optionals (system == "aarch64-linux") [
-            targets.aarch64-unknown-linux-musl.stable.rust-std
-          ]);
-
-        craneLib = (inputs.crane.mkLib final).overrideToolchain rustToolchain;
-
+      overlays.default = final: prev: {
         flakehub-push = inputs.self.packages.${final.stdenv.system}.flakehub-push;
       };
 
-      packages = forAllSystems ({ system, pkgs, ... }: rec {
-        default = flakehub-push;
+      packages = forAllSystems ({ system, pkgs, lib, ... }:
+        let
+          craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustToolchain;
+          rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+            targets = [ "x86_64-unknown-linux-musl" ];
+          };
+        in
+        rec {
+          default = flakehub-push;
 
-        flakehub-push = pkgs.craneLib.buildPackage
-          {
+          flakehub-push = craneLib.buildPackage {
             pname = "flakehub-push";
             version = "0.1.0";
-            src = pkgs.craneLib.path ./.;
+            src = craneLib.path ./.;
 
-            buildInputs = pkgs.lib.optionals (pkgs.stdenv.isDarwin) (with pkgs; [
-              libiconv
+            CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl";
+            CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static";
+
+            buildInputs = lib.optionals (pkgs.stdenv.isDarwin) (with pkgs; [
               darwin.apple_sdk.frameworks.SystemConfiguration
             ]);
-          } // pkgs.lib.optionalAttrs pkgs.stdenv.isLinux {
-          CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl";
-          CARGO_BUILD_RUSTFLAGS = "-C target-feature=+crt-static";
-        };
-      });
+          };
+        });
 
       devShells = forAllSystems ({ system, pkgs, ... }: {
         default = pkgs.mkShell {