diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index eea59d42d4b..f1e49c78f5c 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -14,15 +14,10 @@ distfiles="https://git.zx2c4.com/cgit/snapshot/cgit-${version}.tar.xz
  https://www.kernel.org/pub/software/scm/git/git-${_git_version}.tar.xz"
 checksum="3c547c146340fb16d4134326e7524bfb28ffa681284f1e3914bde1c27a9182bf
  8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92"
-broken="fails lint (ELF in /usr/share)"
 
 post_extract() {
 	rm -r git
 	mv ../git-$_git_version git
-
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) sed -i 's/NO_CURL=1/NO_CURL=1 NO_REGEX=NeedsStartEnd/' Makefile ;;
-	esac
 }
 
 pre_build() {
@@ -32,7 +27,8 @@ pre_build() {
 }
 
 do_build() {
-	make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" prefix=/usr ${makejobs} all doc-man
+	make NO_REGEX=NeedsStartEnd CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+		prefix=/usr ${makejobs} all doc-man
 }
 
 do_check() {
@@ -40,6 +36,6 @@ do_check() {
 }
 
 do_install() {
-	make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" prefix=/usr DESTDIR=${DESTDIR} \
-		CGIT_SCRIPT_PATH=/usr/share/webapps/cgit install install-man
+	make NO_REGEX=NeedsStartEnd CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+		prefix=/usr DESTDIR=${DESTDIR} install install-man
 }
diff --git a/srcpkgs/nsss/template b/srcpkgs/nsss/template
index 95e34de7aef..a46079d158b 100644
--- a/srcpkgs/nsss/template
+++ b/srcpkgs/nsss/template
@@ -5,7 +5,8 @@ revision=1
 build_style=configure
 configure_args="--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
  --with-lib=${XBPS_CROSS_BASE}/usr/lib --enable-shared --libdir=/usr/lib
- --bindir=/usr/bin --dynlibdir=/usr/lib"
+ --bindir=/usr/bin --dynlibdir=/usr/lib -DNSSS_DISABLE_SWITCH
+ -DNSSS_DISABLE_UNIX"
 makedepends="skalibs-devel"
 short_desc="Minimal competing implementation of glibc's Name Switch Service"
 maintainer="Orphaned <orphan@voidlinux.org>"