movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

linuxPackages_latest.prl-tools: 19.4.1-54985 -> 20.0.0-55653 (#341283)

Browse source
This commit is contained in:
Weijia Wang 2024-09-13 11:50:54 +02:00 • committed by GitHub
commit 7cd6534e42
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

28
nixos/modules/virtualisation/parallels-guest.nix
View file

@ -8,6 +8,10 @@ in
{ {
imports = [
(mkRemovedOptionModule [ "hardware" "parallels" "autoMountShares" ] "Shares are always automatically mounted since Parallels Desktop 20.")
];
options = { options = {
hardware.parallels = { 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 { package = mkOption {
type = types.nullOr types.package; type = types.nullOr types.package;
default = config.boot.kernelPackages.prl-tools; 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 = { systemd.services.prlshprint = {
description = "Parallels Printing Tool"; description = "Parallels Printing Tool";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];

6
pkgs/os-specific/linux/prl-tools/default.nix
View file

@ -8,6 +8,7 @@
, perl , perl
, undmg , undmg
, dbus-glib , dbus-glib
, fuse
, glib , glib
, xorg , xorg
, zlib , zlib
@ -36,13 +37,13 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "prl-tools"; 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 # We download the full distribution to extract prl-tools-lin.iso from
# => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso
src = fetchurl { src = fetchurl {
url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; 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" ]; hardeningDisable = [ "pic" "format" ];
@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
dbus-glib dbus-glib
fuse
glib glib
xorg.libX11 xorg.libX11
xorg.libXcomposite xorg.libXcomposite