Enable DAITA on macOS

11 files changed, 20 insertions, 22 deletions

diff --git a/gui/src/renderer/components/WireguardSettings.tsx b/gui/src/renderer/components/WireguardSettings.tsx
index e4cbb17942..61ea7e76d0 100644
--- a/gui/src/renderer/components/WireguardSettings.tsx
+++ b/gui/src/renderer/components/WireguardSettings.tsx
@@ -99,11 +99,9 @@ export default function WireguardSettings() {
                   <Udp2tcpPortSetting />
                 </Cell.Group>
 
-                {(window.env.platform === 'linux' || window.env.platform === 'win32') && (
-                  <Cell.Group>
-                    <DaitaSettings />
-                  </Cell.Group>
-                )}
+                <Cell.Group>
+                  <DaitaSettings />
+                </Cell.Group>
 
                 <Cell.Group>
                   <QuantumResistantSetting />
diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js
index bd9f025bbd..3f8773ed35 100644
--- a/gui/tasks/distribution.js
+++ b/gui/tasks/distribution.js
@@ -107,6 +107,7 @@ const config = {
       { from: distAssets('uninstall_macos.sh'), to: './uninstall.sh' },
       { from: buildAssets('shell-completions/_mullvad'), to: '.' },
       { from: buildAssets('shell-completions/mullvad.fish'), to: '.' },
+      { from: distAssets('maybenot_machines'), to: '.' },
     ],
   },
 
diff --git a/mullvad-cli/build.rs b/mullvad-cli/build.rs
index 13b06384a5..ee547da265 100644
--- a/mullvad-cli/build.rs
+++ b/mullvad-cli/build.rs
@@ -17,9 +17,9 @@ fn main() {
     }
     let target_os = std::env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
 
-    // Enable Daita by default on Linux and Windows.
+    // Enable DAITA by default on desktop
     println!("cargo::rustc-check-cfg=cfg(daita)");
-    if let "linux" | "windows" = target_os.as_str() {
+    if let "linux" | "windows" | "macos" = target_os.as_str() {
         println!(r#"cargo::rustc-cfg=daita"#);
     }
 }
diff --git a/mullvad-daemon/build.rs b/mullvad-daemon/build.rs
index 6f37ea2e19..f89394a688 100644
--- a/mullvad-daemon/build.rs
+++ b/mullvad-daemon/build.rs
@@ -31,9 +31,9 @@ fn main() {
     }
     let target_os = std::env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
 
-    // Enable Daita by default on Linux and Windows.
+    // Enable DAITA by default on desktop
     println!("cargo::rustc-check-cfg=cfg(daita)");
-    if let "linux" | "windows" = target_os.as_str() {
+    if let "linux" | "windows" | "macos" = target_os.as_str() {
         println!(r#"cargo::rustc-cfg=daita"#);
     }
 }
diff --git a/mullvad-management-interface/build.rs b/mullvad-management-interface/build.rs
index c6e53f8a40..569d3379cc 100644
--- a/mullvad-management-interface/build.rs
+++ b/mullvad-management-interface/build.rs
@@ -3,9 +3,9 @@ fn main() {
 
     let target_os = std::env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
 
-    // Enable Daita by default on Linux and Windows.
+    // Enable DAITA by default on desktop
     println!("cargo::rustc-check-cfg=cfg(daita)");
-    if let "linux" | "windows" = target_os.as_str() {
+    if let "linux" | "windows" | "macos" = target_os.as_str() {
         println!(r#"cargo::rustc-cfg=daita"#);
     }
 }
diff --git a/mullvad-relay-selector/build.rs b/mullvad-relay-selector/build.rs
index bab04aea3c..678311e004 100644
--- a/mullvad-relay-selector/build.rs
+++ b/mullvad-relay-selector/build.rs
@@ -1,9 +1,9 @@
 fn main() {
     let target_os = std::env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
 
-    // Enable Daita by default on Linux and Windows.
+    // Enable DAITA by default on desktop
     println!("cargo::rustc-check-cfg=cfg(daita)");
-    if let "linux" | "windows" = target_os.as_str() {
+    if let "linux" | "windows" | "macos" = target_os.as_str() {
         println!(r#"cargo::rustc-cfg=daita"#);
     }
 }
diff --git a/mullvad-types/build.rs b/mullvad-types/build.rs
index bab04aea3c..678311e004 100644
--- a/mullvad-types/build.rs
+++ b/mullvad-types/build.rs
@@ -1,9 +1,9 @@
 fn main() {
     let target_os = std::env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
 
-    // Enable Daita by default on Linux and Windows.
+    // Enable DAITA by default on desktop
     println!("cargo::rustc-check-cfg=cfg(daita)");
-    if let "linux" | "windows" = target_os.as_str() {
+    if let "linux" | "windows" | "macos" = target_os.as_str() {
         println!(r#"cargo::rustc-cfg=daita"#);
     }
 }
diff --git a/talpid-types/build.rs b/talpid-types/build.rs
index bab04aea3c..678311e004 100644
--- a/talpid-types/build.rs
+++ b/talpid-types/build.rs
@@ -1,9 +1,9 @@
 fn main() {
     let target_os = std::env::var("CARGO_CFG_TARGET_OS").expect("CARGO_CFG_TARGET_OS not set");
 
-    // Enable Daita by default on Linux and Windows.
+    // Enable DAITA by default on desktop
     println!("cargo::rustc-check-cfg=cfg(daita)");
-    if let "linux" | "windows" = target_os.as_str() {
+    if let "linux" | "windows" | "macos" = target_os.as_str() {
         println!(r#"cargo::rustc-cfg=daita"#);
     }
 }
diff --git a/talpid-wireguard/build.rs b/talpid-wireguard/build.rs
index a5984ef5fa..1eb3226061 100644
--- a/talpid-wireguard/build.rs
+++ b/talpid-wireguard/build.rs
@@ -14,9 +14,9 @@ fn add_wireguard_go_cfg(target_os: &str) {
         println!("cargo::rustc-cfg=wireguard_go");
     }
 
-    // Enable Daita by default on Linux and Windows.
+    // Enable DAITA by default on desktop
     println!("cargo::rustc-check-cfg=cfg(daita)");
-    if matches!(target_os, "linux" | "windows") {
+    if matches!(target_os, "linux" | "macos" | "windows") {
         println!(r#"cargo::rustc-cfg=daita"#);
     }
 }
diff --git a/wireguard-go-rs/Cargo.toml b/wireguard-go-rs/Cargo.toml
index 9b09df4f75..63a5e462e1 100644
--- a/wireguard-go-rs/Cargo.toml
+++ b/wireguard-go-rs/Cargo.toml
@@ -9,7 +9,7 @@ thiserror.workspace = true
 log.workspace = true
 zeroize = "1.8.1"
 
-[target.'cfg(target_os = "linux")'.dependencies]
+[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
 # The app does not depend on maybenot-ffi itself, but adds it as a dependency to expose FFI symbols to wireguard-go. 
 # This is done, instead of using the makefile in wireguard-go to build maybenot-ffi into its archive, to prevent
 # name clashes induced by link-time optimization.
diff --git a/wireguard-go-rs/build.rs b/wireguard-go-rs/build.rs
index b82fa0eb5f..2b8e28601d 100644
--- a/wireguard-go-rs/build.rs
+++ b/wireguard-go-rs/build.rs
@@ -12,7 +12,7 @@ fn main() {
     cmd.arg("./build-wireguard-go.sh");
 
     match target_os.as_str() {
-        "linux" => {
+        "linux" | "macos" => {
             // Enable DAITA
             println!(r#"cargo::rustc-cfg=daita"#);
             // Tell the build script to build wireguard-go with DAITA support
@@ -21,7 +21,6 @@ fn main() {
         "android" => {
             cmd.arg("--android");
         }
-        "macos" => {}
         // building wireguard-go-rs for windows is not implemented
         _ => return,
     }