pyrox.dev
Merge pull request #34070 from lukeadams/prl-improve
Improve parallels-tools
authored by Jörg Thalheim and committed by GitHub 5d0d140f 6e316ed6
+22
-4
nixos/modules/virtualisation/parallels-guest.nix
+22
-4
nixos/modules/virtualisation/parallels-guest.nix
···
3
with lib;
4
5
let
6
-
7
-
prl-tools = config.boot.kernelPackages.prl-tools;
8
-
9
in
10
11
{
···
22
'';
23
};
24
25
};
26
27
};
···
67
};
68
};
69
70
-
systemd.services.prlfsmountd = {
71
description = "Parallels Shared Folders Daemon";
72
wantedBy = [ "multi-user.target" ];
73
serviceConfig = rec {
···
3
with lib;
4
5
let
6
+
prl-tools = config.hardware.parallels.package;
7
in
8
9
{
···
20
'';
21
};
22
23
+
autoMountShares = mkOption {
24
+
type = types.bool;
25
+
default = true;
26
+
description = ''
27
+
Control prlfsmountd service. When this service is running, shares can not be manually
28
+
mounted through `mount -t prl_fs ...` as this service will remount and trample any set options.
29
+
Recommended to enable for simple file sharing, but extended share use such as for code should
30
+
disable this to manually mount shares.
31
+
'';
32
+
};
33
+
34
+
package = mkOption {
35
+
type = types.package;
36
+
default = config.boot.kernelPackages.prl-tools;
37
+
defaultText = "config.boot.kernelPackages.prl-tools";
38
+
example = literalExample "config.boot.kernelPackages.prl-tools";
39
+
description = ''
40
+
Defines which package to use for prl-tools. Override to change the version.
41
+
'';
42
+
};
43
};
44
45
};
···
85
};
86
};
87
88
+
systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares {
89
description = "Parallels Shared Folders Daemon";
90
wantedBy = [ "multi-user.target" ];
91
serviceConfig = rec {
+4
-1
pkgs/os-specific/linux/prl-tools/default.nix
+4
-1
pkgs/os-specific/linux/prl-tools/default.nix
···
2
, gawk, utillinux, xorg, glib, dbus-glib, zlib
3
, kernel ? null, libsOnly ? false
4
, undmg, fetchurl
5
}:
6
7
assert (!libsOnly) -> kernel != null;
8
9
let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version;
10
xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer));
···
27
hardeningDisable = [ "pic" "format" ];
28
29
# also maybe python2 to generate xorg.conf
30
-
nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ];
31
32
inherit libsOnly;
33
···
2
, gawk, utillinux, xorg, glib, dbus-glib, zlib
3
, kernel ? null, libsOnly ? false
4
, undmg, fetchurl
5
+
, libelf
6
}:
7
8
assert (!libsOnly) -> kernel != null;
9
+
# Disable for kernels 4.15 and above due to compatibility issues
10
+
assert kernel != null -> stdenv.lib.versionOlder kernel.version "4.15";
11
12
let xorgFullVer = (builtins.parseDrvName xorg.xorgserver.name).version;
13
xorgVer = lib.concatStringsSep "." (lib.take 2 (lib.splitString "." xorgFullVer));
···
30
hardeningDisable = [ "pic" "format" ];
31
32
# also maybe python2 to generate xorg.conf
33
+
nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies;
34
35
inherit libsOnly;
36