build-all.sh

@@ -3,8 +3,6 @@
 # in all available configurations--Nix introspection is a bit complicated,
 # so they're listed explicitly.
 
-# In case of stale checkouts: rm -rf ~/.cache/nix
-
 build() {
 	echo "$(tput bold)-- Building $*$(tput sgr0)"
 	nix-build --arg local ${LOCAL:-false} "$@"

desktop-tools-master.nix

@@ -43,9 +43,13 @@ 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;

razer-bw-te-ctl-master.nix

@@ -3,7 +3,7 @@
 , full ? true
 }:
 pkgs.stdenv.mkDerivation rec {
-	pname = "usb-drivers";
+	pname = "razer-bw-te-ctl";
 	version = "master";
 
 	nativeBuildInputs = with pkgs; [
@@ -13,8 +13,7 @@ pkgs.stdenv.mkDerivation rec {
 	];
 
 	buildInputs = with pkgs; [
-		libusb1
-		hidapi
+		libusb
 	];
 
 	src = if local then
@@ -29,14 +28,10 @@ pkgs.stdenv.mkDerivation rec {
 			ref = "master";
 		};
 
-	cmakeFlags = [
-		"-DSETUID="
-	];
-
 	doCheck = true;
 
 	meta = with pkgs.lib; {
-		description = "User space USB drivers";
+		description = "Razer BlackWidow Tournament Edition control utility";
 		homepage = "https://git.janouch.name/p/${pname}";
 		platforms = platforms.all;
 		license = licenses.bsd0;

sensei-raw-ctl-master.nix

@@ -13,7 +13,7 @@ pkgs.stdenv.mkDerivation rec {
 	];
 
 	buildInputs = with pkgs; [
-		libusb1
+		libusb
 	] ++ lib.optionals full [
 		gtk3
 

xK-master.nix

@@ -63,7 +63,7 @@ pkgs.stdenv.mkDerivation rec {
 
 		modRoot = "./${_pname}/";
 #		vendorHash = pkgs.lib.fakeHash;
-		vendorHash = "sha256-feaUOP+joGnpjqniCtstRGHwcMyGNZ95PwEXWzjmjIk=";
+		vendorHash = "sha256-TK3rivjzYZwG8bfia22iQO5ZKnBzeIidsHNl6jnQUio=";
 
 		mithril = pkgs.fetchurl {
 			url = "https://unpkg.com/mithril@2.2.3/mithril.js";
@@ -129,8 +129,6 @@ pkgs.stdenv.mkDerivation rec {
 		'';
 	};
 
-	# Ignoring xA, as it is huge, and already checked through CI.
-
 	# While we can't include them in this derivation, we can link to them.
 	postInstall = pkgs.lib.optionals full ''
 		makeWrapper ${xP}/lib/xP/xP $out/bin/xP --chdir ${xP}/share/xP/public