diff --git a/desktop-tools-master.nix b/desktop-tools-master.nix
index df15895..32711bf 100644
--- a/desktop-tools-master.nix
+++ b/desktop-tools-master.nix
@@ -43,13 +43,9 @@ pkgs.stdenv.mkDerivation rec {
 			ref = "master";
 		};
 
-	# It's a weird mess, gdm.pc.in includes the subdirectory in includedir.
-	patchPhase = ''
-		sed -i 's|gdm-user-switching.h>|gdm/&|' gdm-switch-user.c
-	'';
-
 	cmakeFlags = [
 		"-DSYSTEMD_UNITDIR=${placeholder "out"}/lib/systemd/system"
+		"-DSETUID="
 	];
 
 	doCheck = true;
diff --git a/razer-bw-te-ctl-master.nix b/usb-drivers-master.nix
similarity index 84%
rename from razer-bw-te-ctl-master.nix
rename to usb-drivers-master.nix
index b64550b..8818e4a 100644
--- a/razer-bw-te-ctl-master.nix
+++ b/usb-drivers-master.nix
@@ -3,7 +3,7 @@
 , full ? true
 }:
 pkgs.stdenv.mkDerivation rec {
-	pname = "razer-bw-te-ctl";
+	pname = "usb-drivers";
 	version = "master";
 
 	nativeBuildInputs = with pkgs; [
@@ -14,6 +14,7 @@ pkgs.stdenv.mkDerivation rec {
 
 	buildInputs = with pkgs; [
 		libusb
+		hidapi
 	];
 
 	src = if local then
@@ -28,10 +29,14 @@ pkgs.stdenv.mkDerivation rec {
 			ref = "master";
 		};
 
+	cmakeFlags = [
+		"-DSETUID="
+	];
+
 	doCheck = true;
 
 	meta = with pkgs.lib; {
-		description = "Razer BlackWidow Tournament Edition control utility";
+		description = "User space USB drivers";
 		homepage = "https://git.janouch.name/p/${pname}";
 		platforms = platforms.all;
 		license = licenses.bsd0;