diff --git a/src/builders/build_wivrn.rs b/src/builders/build_wivrn.rs
index f2a415d..cd9d757 100644
--- a/src/builders/build_wivrn.rs
+++ b/src/builders/build_wivrn.rs
@@ -34,23 +34,29 @@ pub fn get_build_wivrn_jobs(profile: &Profile, clean_build: bool) -> VecDeque<Wo
     jobs.extend(git.get_pre_build_jobs(profile.pull_on_build));
 
     let build_dir = profile.xrservice_path.join("build");
-    let mut cmake_vars: HashMap<String, String> = HashMap::new();
-    cmake_vars.insert("CMAKE_EXPORT_COMPILE_COMMANDS".into(), "ON".into());
-    cmake_vars.insert("CMAKE_BUILD_TYPE".into(), "RelWithDebInfo".into());
-    cmake_vars.insert("XRT_HAVE_SYSTEM_CJSON".into(), "NO".into());
-    cmake_vars.insert("WIVRN_BUILD_CLIENT".into(), "OFF".into());
-    cmake_vars.insert(
-        "CMAKE_INSTALL_PREFIX".into(),
-        profile.prefix.to_string_lossy().to_string(),
-    );
-
-    profile.xrservice_cmake_flags.iter().for_each(|(k, v)| {
-        cmake_vars.insert(k.clone(), v.clone());
-    });
 
     let cmake = Cmake {
         env: None,
-        vars: Some(cmake_vars),
+        vars: Some({
+            let mut cmake_vars: HashMap<String, String> = HashMap::new();
+            for (k, v) in [
+                ("CMAKE_EXPORT_COMPILE_COMMANDS", "ON"),
+                ("CMAKE_BUILD_TYPE", "RelWithDebInfo"),
+                ("XRT_HAVE_SYSTEM_CJSON", "NO"),
+                ("WIVRN_BUILD_CLIENT", "OFF"),
+                ("WIVRN_BUILD_WIVRNCTL", "OFF"),
+            ] {
+                cmake_vars.insert(k.to_string(), v.to_string());
+            }
+            cmake_vars.insert(
+                "CMAKE_INSTALL_PREFIX".into(),
+                profile.prefix.to_string_lossy().to_string(),
+            );
+            profile.xrservice_cmake_flags.iter().for_each(|(k, v)| {
+                cmake_vars.insert(k.clone(), v.clone());
+            });
+            cmake_vars
+        }),
         source_dir: profile.xrservice_path.clone(),
         build_dir: build_dir.clone(),
     };