build.yml: enable build on aarch64-darwin

.github/workflows/build.yml

@@ -13,8 +13,7 @@ jobs:
     strategy:
       matrix:
         arch:
-          - { name: 'x86_64-linux', runs-on: ubuntu-latest }
-          - { name: 'x86_64-darwin', runs-on: macos-latest }
+          - { name: 'aarch64-darwin', runs-on: macos-latest }
     name: ${{ matrix.arch.name }}
     runs-on: ${{ matrix.arch.runs-on }}
     steps:

README.md

@@ -3,7 +3,8 @@
 Supported architectures:
 
   - `x86_64-linux` (Linux and possibly WSL2 on Windows)
-  - `x86_64-darwin` (macOS)
+  - `aarch64-darwin` (macOS on Apple Silicon)
+  - `x86_64-darwin` (macOS on Intel)
 
 Usage
 =====

flake.nix

@@ -54,7 +54,7 @@
     let
 
       inherit (nixpkgs) lib;
-      supportedSystems = [ "x86_64-linux" "x86_64-darwin" ];
+      supportedSystems = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ];
 
       pkgsFor = system: import nixpkgs {
         inherit system;
@@ -129,18 +129,18 @@
               '';
             };
 
-            fun4all-env = pkgs.mkShell rec {
-              buildInputs = with self.packages.${system}; [
-                fun4all
-                root
-                sartre
-                geant4.data.G4EMLOW
-                geant4.data.G4ENSDFSTATE
-                geant4.data.G4ENSDFSTATE
-                geant4.data.G4PARTICLEXS
-                geant4.data.G4PhotonEvaporation
-              ];
-            };
+            #fun4all-env = pkgs.mkShell rec {
+            #  buildInputs = with self.packages.${system}; [
+            #    fun4all
+            #    root
+            #    sartre
+            #    geant4.data.G4EMLOW
+            #    geant4.data.G4ENSDFSTATE
+            #    geant4.data.G4ENSDFSTATE
+            #    geant4.data.G4PARTICLEXS
+            #    geant4.data.G4PhotonEvaporation
+            #  ];
+            #};
           });
 
     };

overlay.nix

@@ -60,7 +60,7 @@ final: prev: with final; {
     '';
   });
 
-  fun4all = callPackage pkgs/fun4all {};
+  #fun4all = callPackage pkgs/fun4all {};
 
   gaudi = callPackage pkgs/gaudi {
     inherit (darwin.apple_sdk.frameworks) Foundation;
@@ -84,7 +84,7 @@ final: prev: with final; {
     ];
   });
 
-  genfit = callPackage pkgs/genfit {};
+  #genfit = callPackage pkgs/genfit {};
 
   hepmc3 = prev.hepmc3.overrideAttrs (old:
     (final.lib.optionalAttrs (final.lib.versionOlder prev.hepmc3.version "3.2.6") rec {
@@ -108,7 +108,7 @@ final: prev: with final; {
 
   jana2 = callPackage pkgs/jana2 { inherit jana2-src; };
 
-  juggler = callPackage pkgs/juggler { inherit juggler-src; };
+  #juggler = callPackage pkgs/juggler { inherit juggler-src; };
 
   k4FWCore = callPackage pkgs/k4FWCore {};
 
@@ -127,24 +127,26 @@ final: prev: with final; {
     ];
   });
 
-  root = prev.root.overrideAttrs (prev: {
+  root = (prev.root.override { tbb = null; }).overrideAttrs (prev: {
     cmakeFlags = prev.cmakeFlags ++ [
       "-DCMAKE_CXX_STANDARD=20"
+      "-DCMAKE_BUILD_TYPE=Debug"
       "-Dssl=ON" # for Gaudi
       "-Dbuiltin_unuran=ON"
       "-Dpythia6=ON" # for fun4all
       "-Dunuran=ON" # for sartre
       "-Droot7=ON" "-Dwebgui=ON" "-Dbuiltin_openui5=ON" # ROOT::ROOTGeomViewer for dd4hep
+      "-Dbuiltin_glew=ON"
     ] ++ final.lib.optionals final.stdenv.isDarwin [
       # https://github.com/AIDASoft/podio/issues/367
       "-Dimt=OFF"
     ];
     NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "--version-script,${./pkgs/root/version.map}";
-    preConfigure = builtins.replaceStrings [ "rm -rf builtins/*" ] [ "" ] prev.preConfigure;
+    preConfigure = builtins.replaceStrings [ "rm -rf builtins/*" "for path in builtins/*; do" ] [ "" "for path in ; do" ] prev.preConfigure;
     buildInputs  = prev.buildInputs ++ [
       openssl
       pythia6
-    ] ++ final.lib.optionals final.stdenv.isDarwin [
+    ] ++ final.lib.optionals (stdenv.system == "x86_64-darwin") [
       memorymappingHook # for roofit/xroofit/src/xRooNLLVar.cxx
     ];
   });
@@ -197,12 +199,12 @@ final: prev: with final; {
 
   pythia6 = callPackage pkgs/pythia6 {};
 
-  rave = callPackage pkgs/rave {};
+  #rave = callPackage pkgs/rave {};
 
   sartre = callPackage pkgs/sartre {};
 
-  veccore = callPackage pkgs/veccore {};
+  #veccore = callPackage pkgs/veccore {};
 
-  vecgeom = callPackage pkgs/vecgeom {};
+  #vecgeom = callPackage pkgs/vecgeom {};
 
 }