diff --git a/packages/journalctl-last-invocation/package.nix b/packages/journalctl-last-invocation/package.nix
index b765eef..35c1d44 100644
--- a/packages/journalctl-last-invocation/package.nix
+++ b/packages/journalctl-last-invocation/package.nix
@@ -1,7 +1,4 @@
-{
-	pkgs ,
-	stdenv ,
-} :
+{ pkgs , stdenv } :
 
 with pkgs ;
 with stdenv ;
@@ -13,6 +10,7 @@ mkDerivation {
 	phases = [ "createSourcesPhase" "installPhase" ] ;
 
 	createSourcesPhase = ''
+		# Same directory structure that `unpackPhase` would use
 		mkdir -p /build/source
 
 		cat <<- EOF > /build/source/journalctl-last-invocation
diff --git a/packages/nix-store-fuzzy-find/package.nix b/packages/nix-store-fuzzy-find/package.nix
index 6230900..3639839 100644
--- a/packages/nix-store-fuzzy-find/package.nix
+++ b/packages/nix-store-fuzzy-find/package.nix
@@ -1,7 +1,4 @@
-{
-	pkgs ,
-	stdenv ,
-} :
+{ pkgs , stdenv } :
 
 with pkgs ;
 with stdenv ;
@@ -10,18 +7,24 @@ mkDerivation {
 	pname = "nix-store-fuzzy-find" ;
 	version = "2025-03-09" ;
 
-	phases = [ "installPhase" ] ;
+	phases = [ "createSourcesPhase" "installPhase" ] ;
 
-	installPhase = ''
-		mkdir -p $out/bin
+	createSourcesPhase = ''
+		# Same directory structure that `unpackPhase` would use
+		mkdir -p /build/source
 
-		cat <<- EOF > $out/bin/nix-store-fuzzy-find
+		cat <<- EOF > /build/source/nix-store-fuzzy-find
 			#!${bash}/bin/sh
 
 			exec ${findutils}/bin/find /nix/store -maxdepth 1 -type d -name "*-\$1-*"
 		EOF
+	'' ;
 
-		# TODO: Check if Nix does this for us
-		chmod +x $out/bin/*
+	installPhase = ''
+		mkdir -p $out/bin
+
+		cp /build/source/nix-store-fuzzy-find $out/bin/
+
+		chmod +x $out/bin/nix-store-fuzzy-find
 	'' ;
 }