diff options
| author | Jeremy Kolb <jkolb@ara.com> | 2022-06-02 15:14:41 -0400 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-06-09 15:14:10 +0000 |
| commit | 7cf936ba73eaf15859fd79c36c0b369409b69056 (patch) | |
| tree | 655f896072a24cde7ded8b2975f90eada797cc7c | |
| parent | Merge pull request #177030 from NixOS/backport-176821-to-release-22.05 (diff) | |
| download | nixpkgs-origin/backport-175985-to-release-22.05.tar.gz | |
open-vm-tools: fix shared foldersorigin/backport-175985-to-release-22.05
(cherry picked from commit 12d74e3abf8392898411d209096484516c2887ca)
| -rw-r--r-- | pkgs/applications/virtualization/open-vm-tools/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 6018608a3f16..a6c9b690e8b9 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -2,7 +2,7 @@ , bash, fuse3, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto , libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst , pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute2, dbus, systemd, which -, libdrm, udev +, libdrm, udev, util-linux , withX ? true }: @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { # Make reboot work, shutdown is not in /sbin on NixOS sed -i 's,/sbin/shutdown,shutdown,' lib/system/systemLinux.c + + # Fix paths to fuse3 (we do not use fuse2 so that is not modified) + sed -i 's,/bin/fusermount3,${fuse3}/bin/fusermount3,' vmhgfs-fuse/config.c + + substituteInPlace services/plugins/vix/foundryToolsDaemon.c \ + --replace "/usr/bin/vmhgfs-fuse" "${placeholder "out"}/bin/vmhgfs-fuse" \ + --replace "/bin/mount" "${util-linux}/bin/mount" ''; configureFlags = [ |