flake: support macos and improve readibility

Signed-off-by: Élyse Viard <[email protected]>
OpenRailAssociation · Nov 7, 2024 · 337c478 · 337c478
1 parent 00a169a
commit 337c478
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/flake.nix b/flake.nix
@@ -47,19 +47,17 @@
       with pkgs;
       {
         devShells.default = mkShell {
-          nativeBuildInputs = [
-            # Rust
-            rustChan
-            # Linker
-            mold-wrapped
-            # Libs
-            geos
-            openssl
-            pkg-config
-            postgresql
-          ];
           buildInputs =
             [
+              # Rust
+              rustChan
+
+              # Libs
+              geos
+              openssl
+              pkg-config
+              postgresql
+
               # Tools & Libs
               diesel-cli
               cargo-watch
@@ -86,16 +84,24 @@
 
               # OSRD dev scripts
               osrd-dev-scripts
+
+            ]
+            # Section added only on Linux systems
+            ++ lib.optionals (!stdenv.isDarwin) [
+              # Linker
+              mold-wrapped
             ]
+            # Section added only on Darwin (macOS) systems
             ++ lib.optionals stdenv.isDarwin (
               with pkgs.darwin.apple_sdk.frameworks;
               [
                 CoreFoundation
                 SystemConfiguration
+                libiconv
               ]
             );
 
-          RUSTFLAGS = "-C link-arg=-fuse-ld=mold";
+          RUSTFLAGS = if stdenv.isDarwin then "" else "-C link-arg=-fuse-ld=mold";
         };
       }
     );