fakedir patch upstreamed

the null buffer issue has been resolved upstreamed with a PR. also, fix
an issue with symlinks/shebangs not being rewritten for the initial
program executed by the startup script -- we need to avoid that call to
execvp happening in the process environment that existed prior to the
injection of the fakedir libraries. to do that, run a new shell where
the exported env vars are set and avoid that shell just execing by first
testing if the fakedir library is present and loaded, then running the
specified executable.

Author: Cassandra Comar

Diff for: fakedir-null-buffer.patch

@@ -8,7 +8,7 @@
     bundlers = {
       nix-bundle = { program, system }: let
         nixpkgs' = nixpkgs.legacyPackages.${system};
-        fakedir = fakedir-pkgs.packages.${system}.fakedir.overrideAttrs (old: { patches = [./fakedir-null-buffer.patch]; });
+        fakedir = fakedir-pkgs.packages.${system}.fakedir-universal;
         nix-bundle = import self { nixpkgs = nixpkgs'; inherit fakedir; };
         script-linux = nixpkgs'.writeScript "startup" ''
           #!/bin/sh
@@ -22,8 +22,10 @@
           export DYLD_INSERT_LIBRARIES="''${__TMPX_DAT_PATH}/lib/libfakedir.dylib"
           export FAKEDIR_PATTERN=/nix
           export FAKEDIR_TARGET="''${__TMPX_DAT_PATH}/nix"
+          export FAKEDIR_DEBUG=1
 
-          exec "''${__TMPX_DAT_PATH}$(dirname ${program})/$(basename "$0")" "$@"
+          # make sure the fakedir libraries are loaded and avoid sh execing without the libraries loaded first
+          sh -c "test -e $DYLD_INSERT_LIBRARIES && ''${__TMPX_DAT_PATH}$(dirname ${program})/$(basename "$0") $@"
         '';
         script = if nixpkgs'.stdenv.isDarwin then script-darwin else script-linux;
       in nix-bundle.makebootstrap {