diff --git a/fiv-master.nix b/fiv-master.nix
index 15605bc..a98cd8c 100644
--- a/fiv-master.nix
+++ b/fiv-master.nix
@@ -7,6 +7,7 @@ pkgs.stdenv.mkDerivation rec {
 	version = "master";
 
 	nativeBuildInputs = with pkgs; [
+		wrapGAppsHook
 		meson
 		pkg-config
 		ninja
@@ -46,6 +47,9 @@ pkgs.stdenv.mkDerivation rec {
 	# Up for consideration: don't rely on shebangs at all.
 	patchPhase = ''
 		patchShebangs .
+
+		# https://gitlab.gnome.org/GNOME/glib/-/issues/30240
+		ulimit -n 8192
 	'';
 
 	mesonFlags = [
@@ -67,6 +71,12 @@ pkgs.stdenv.mkDerivation rec {
 		"-Dgdk-pixbuf=disabled"
 	];
 
+	preFixup = ''
+		gappsWrapperArgs+=(
+			--prefix PATH : $out/bin:${pkgs.lib.makeBinPath [ pkgs.exiftool ]}
+		)
+	'';
+
 	doCheck = true;
 
 	meta = with pkgs.lib; {
diff --git a/logdiag-master.nix b/logdiag-master.nix
index fc978a1..82bf3d2 100644
--- a/logdiag-master.nix
+++ b/logdiag-master.nix
@@ -7,9 +7,9 @@ pkgs.stdenv.mkDerivation rec {
 	version = "master";
 
 	nativeBuildInputs = with pkgs; [
+		wrapGAppsHook
 		cmake
 		pkg-config
-		wrapGAppsHook
 	];
 
 	buildInputs = with pkgs; [