From 9b08089459b5244bba4e5d8974f036a715a7b2ad Mon Sep 17 00:00:00 2001
From: Joshua Park <joshuprk@gmail.com>
Date: Fri, 7 Feb 2025 12:34:32 -0500
Subject: [PATCH] buildFHSEnv: implement chdirToPwd for disabling automatic
 chdir

---
 pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
index c204628d1668..e6df8f2eabc2 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
@@ -30,6 +30,7 @@
   unshareUts ? false,
   unshareCgroup ? false,
   privateTmp ? false,
+  chdirToPwd ? true,
   dieWithParent ? true,
   ...
 }@args:
@@ -279,7 +280,7 @@ let
         ${bubblewrap}/bin/bwrap
         --dev-bind /dev /dev
         --proc /proc
-        --chdir "$(pwd)"
+        ${optionalString chdirToPwd ''--chdir "$(pwd)"''}
         ${optionalString unshareUser "--unshare-user"}
         ${optionalString unshareIpc "--unshare-ipc"}
         ${optionalString unsharePid "--unshare-pid"}