diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix
index d8701d6f833f..d24ef8316ca2 100644
--- a/pkgs/by-name/bu/buildah-unwrapped/package.nix
+++ b/pkgs/by-name/bu/buildah-unwrapped/package.nix
@@ -12,6 +12,7 @@
   libapparmor,
   libselinux,
   libseccomp,
+  writableTmpDirAsHomeHook,
   versionCheckHook,
 }:
 
@@ -69,8 +70,12 @@ buildGoModule (finalAttrs: {
   '';
 
   doInstallCheck = true;
-  nativeInstallCheckInputs = [ versionCheckHook ];
+  nativeInstallCheckInputs = [
+    writableTmpDirAsHomeHook
+    versionCheckHook
+  ];
   versionCheckProgramArg = "--version";
+  versionCheckKeepEnvironment = [ "HOME" ];
 
   meta = {
     description = "Tool which facilitates building OCI images";
diff --git a/pkgs/by-name/bu/buildah/package.nix b/pkgs/by-name/bu/buildah/package.nix
index 12fd33a51480..ff11b89b2182 100644
--- a/pkgs/by-name/bu/buildah/package.nix
+++ b/pkgs/by-name/bu/buildah/package.nix
@@ -74,5 +74,5 @@ runCommand buildah-unwrapped.name
     ln -s ${buildah-unwrapped}/share $out/share
     makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \
       --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \
-      --prefix PATH : ${binPath}
+      --prefix PATH : "${binPath}"
   ''