diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index d490dda7b5c..32cc390fd3a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -3,7 +3,7 @@ pkgname=kicad
 version=5.0.0
 revision=2
 build_style=cmake
-configure_args="-DKICAD_BUILD_VERSION=$version -DKICAD_SCRIPTING=ON
+configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
 -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
 -DKICAD_SCRIPTING_ACTION_MENU=ON  -DBUILD_GITHUB_PLUGIN=ON -DKICAD_USE_OCE=OFF
 -DKICAD_SPICE=$(vopt_if spice ON OFF)"
@@ -24,6 +24,9 @@ CXXFLAGS="-std=c++14"
 
 # currently disabled on arm because nocross is set for ngspice
 case $XBPS_TARGET_MACHINE in
+	armv6l-musl)
+		broken="depends on broken tbb"
+		;;
 	*-musl)
 		;;
 	*)
@@ -32,14 +35,14 @@ case $XBPS_TARGET_MACHINE in
 esac
 
 
-if [ -n "$CROSS_BUILD" ]; then
+if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python wxPython"
 	configure_args+=" -DPYTHON_SITE_PACKAGE_PATH=${XBPS_CROSS_BASE}/usr/lib/python${py2_ver}/site-packages
 	 -DPYTHON_DEST=/usr/lib/python${py2_ver}/site-packages"
 fi
 
 pre_configure() {
-	if [ -n "$CROSS_BUILD" ]; then
+	if [ "$CROSS_BUILD" ]; then
 		CXXFLAGS+=" $(wx-config --cxxflags)"
 	fi
 }