diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d9e2c5c2..de94a5b38 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 #cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .
 #cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr .
 #cmake -DGENERATE_DEB=true -DDEB_ARCHITECTURE=i386|amd64|armhf -DDEB_PLATFORM=ubuntu -DDEB_DISTRO=eoan -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
-#cmake -DCMAKE_BUILD_TYPE=Release - -DBUILD_STANDALONE=true .
+#cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_STANDALONE=true .
 
 cmake_minimum_required(VERSION 3.0)
 
diff --git a/script/archive-standalone-nix.sh b/script/archive-standalone-nix.sh
index ead14f11f..d39ed6b9c 100755
--- a/script/archive-standalone-nix.sh
+++ b/script/archive-standalone-nix.sh
@@ -42,9 +42,9 @@ fi
 OS_SPECIFIC_BUILD_FLAGS=""
 if [[ $OS == "Linux" ]]; then
   OS_SPECIFIC_BUILD_FLAGS="-DGENERATE_DEB=true -DDEB_ARCHITECTURE=${DEB_ARCH} -DCMAKE_INSTALL_PREFIX=/usr"
-  if [[ -z $CROSSCOMPILE ]]; then
+  if [[ $CROSSCOMPILE == "rpi" ]]; then
     # for now we don't support pipewire when cross compiling...
-    OS_SPECIFIC_BUILD_FLAGS="$OS_SPECIFIC_BUILD_FLAGS -DENABLE_PIPEWIRE=true"
+    OS_SPECIFIC_BUILD_FLAGS="$OS_SPECIFIC_BUILD_FLAGS -DENABLE_PIPEWIRE=false"
   fi
 fi
 
diff --git a/src/plugins/pipewireout/CMakeLists.txt b/src/plugins/pipewireout/CMakeLists.txt
index 836b53c27..1c80e53dc 100644
--- a/src/plugins/pipewireout/CMakeLists.txt
+++ b/src/plugins/pipewireout/CMakeLists.txt
@@ -3,12 +3,16 @@ set (pipewireout_SOURCES
   PipeWireOut.cpp
 )
 
-find_package(PkgConfig)
-pkg_check_modules(PIPEWIRE IMPORTED_TARGET libpipewire-0.3)
-
-if (NOT DEFINED PIPEWIRE_LINK_LIBRARIES)
+if (${ENABLE_PIPEWIRE} MATCHES "false")
   disable_plugin(pipewireout)
 else()
-  add_library(pipewireout SHARED ${pipewireout_SOURCES})
-  target_link_libraries(pipewireout PkgConfig::PIPEWIRE)
+  find_package(PkgConfig)
+  pkg_check_modules(PIPEWIRE IMPORTED_TARGET libpipewire-0.3)
+  if (NOT DEFINED PIPEWIRE_LINK_LIBRARIES)
+    disable_plugin(pipewireout)
+  else()
+    add_library(pipewireout SHARED ${pipewireout_SOURCES})
+    target_link_libraries(pipewireout PkgConfig::PIPEWIRE)
+  endif()
 endif()
+