Remove env.sh

.github/workflows/rustdoc.yml

@@ -9,7 +9,6 @@ on:
       - "rust-toolchain.toml"
       - "rustfmt.toml"
       - "ci/cargo-ci.sh"
-      - "env.sh"
 
   workflow_dispatch:
     inputs:

BuildInstructions.md

@@ -290,11 +290,6 @@ TARGETS="riscv64gc-unknown-linux-gnu" ./build.sh --daemon-only --optimize
 
 This section is for building the system service individually.
 
-1. On macOS, source `env.sh` to set the default environment variables:
-    ```bash
-    source env.sh
-    ```
-
 1. On Windows, build the C++ libraries:
     ```bash
     ./build-windows-modules.sh

build.sh

@@ -370,7 +370,6 @@ if [[ "$(uname -s)" == "MINGW"* ]]; then
 fi
 
 for t in "${TARGETS[@]:-""}"; do
-    source env.sh "$t"
     build "$t"
 done
 

ci/cargo-ci.sh

@@ -2,12 +2,6 @@
 
 set -eux
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Explicitly pass empty first argument, otherwise this script will pass on its arguments in a `source` invocation.
-# shellcheck disable=SC1091
-source "$SCRIPT_DIR/../env.sh" ""
-
 # Hard deny on all warnings when running in CI
 export RUSTFLAGS="--deny warnings"
 

mullvad-daemon/build.rs

@@ -39,6 +39,15 @@ fn main() {
     if matches!(target_os(), Os::Windows | Os::Macos) {
         println!(r#"cargo::rustc-cfg=in_app_upgrade"#);
     }
+
+    if matches!(target_os(), Os::Macos) {
+        // Set the minimum version of macOS on which mullvad-daemon can run.
+        if cfg!(target_arch = "x86_64") {
+            println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.12");
+        } else if cfg!(target_arch = "aarch64") {
+            println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=11.0");
+        }
+    }
 }
 
 fn commit_date() -> String {