diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index b92d30dcc0e2..91a0532fbaab 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -8,6 +8,10 @@ in { + imports = [ + (mkRemovedOptionModule [ "hardware" "parallels" "autoMountShares" ] "Shares are always automatically mounted since Parallels Desktop 20.") + ]; + options = { hardware.parallels = { @@ -20,17 +24,6 @@ in ''; }; - autoMountShares = mkOption { - type = types.bool; - default = true; - description = '' - Control prlfsmountd service. When this service is running, shares can not be manually - mounted through `mount -t prl_fs ...` as this service will remount and trample any set options. - Recommended to enable for simple file sharing, but extended share use such as for code should - disable this to manually mount shares. - ''; - }; - package = mkOption { type = types.nullOr types.package; default = config.boot.kernelPackages.prl-tools; @@ -68,19 +61,6 @@ in }; }; - systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares { - description = "Parallels Guest File System Sharing Tool"; - wantedBy = [ "multi-user.target" ]; - path = [ prl-tools ]; - serviceConfig = rec { - ExecStart = "${prl-tools}/sbin/prlfsmountd ${PIDFile}"; - ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /media"; - ExecStopPost = "${prl-tools}/sbin/prlfsmountd -u"; - PIDFile = "/run/prlfsmountd.pid"; - WorkingDirectory = "${prl-tools}/bin"; - }; - }; - systemd.services.prlshprint = { description = "Parallels Printing Tool"; wantedBy = [ "multi-user.target" ]; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 9b2d6778f925..bb8a81d46056 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -8,6 +8,7 @@ , perl , undmg , dbus-glib +, fuse , glib , xorg , zlib @@ -36,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.4.1-54985"; + version = "20.0.0-55653"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-VBHCsxaMI6mfmc/iQ4hJW/592rKck9HilTX2Hq7Hb5s="; + hash = "sha256-ohGhaLVzXuR/mQ6ToeGbTixKy01F14JSgTs128vGZXM="; }; hardeningDisable = [ "pic" "format" ]; @@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ dbus-glib + fuse glib xorg.libX11 xorg.libXcomposite