diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-21 15:25:58 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-21 15:25:58 -0500 |
commit | 29dc27c5a3df21565dd7e5f94d2f1a614a64a96f (patch) | |
tree | f4cd8a07b830aae049ede4c70ec0782e3563a624 /nixos/modules/services/computing | |
parent | 405daa25f165e6cd4f3ae82b8619a029c85cfa77 (diff) | |
parent | 9fad70f1de9918ad6a280fe8ac243173b0329789 (diff) | |
download | nixlib-29dc27c5a3df21565dd7e5f94d2f1a614a64a96f.tar nixlib-29dc27c5a3df21565dd7e5f94d2f1a614a64a96f.tar.gz nixlib-29dc27c5a3df21565dd7e5f94d2f1a614a64a96f.tar.bz2 nixlib-29dc27c5a3df21565dd7e5f94d2f1a614a64a96f.tar.lz nixlib-29dc27c5a3df21565dd7e5f94d2f1a614a64a96f.tar.xz nixlib-29dc27c5a3df21565dd7e5f94d2f1a614a64a96f.tar.zst nixlib-29dc27c5a3df21565dd7e5f94d2f1a614a64a96f.zip |
Merge pull request #30908 from kierdavis/boinc-fhs
boinc service: use an FHS environment (CI now passing)
Diffstat (limited to 'nixos/modules/services/computing')
-rw-r--r-- | nixos/modules/services/computing/boinc/client.nix | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index e43b6bbb2536..8abe3c5b8c9b 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -6,6 +6,13 @@ let cfg = config.services.boinc; allowRemoteGuiRpcFlag = optionalString cfg.allowRemoteGuiRpc "--allow_remote_gui_rpc"; + fhsEnv = pkgs.buildFHSUserEnv { + name = "boinc-fhs-env"; + targetPkgs = pkgs': [ cfg.package ] ++ cfg.extraEnvPackages; + runScript = "/bin/boinc_client"; + }; + fhsEnvExecutable = "${fhsEnv}/bin/${fhsEnv.name}"; + in { options.services.boinc = { @@ -49,6 +56,43 @@ in See also: <link xlink:href="http://boinc.berkeley.edu/wiki/Controlling_BOINC_remotely#Remote_access"/> ''; }; + + extraEnvPackages = mkOption { + type = types.listOf types.package; + default = []; + example = "[ pkgs.virtualbox ]"; + description = '' + Additional packages to make available in the environment in which + BOINC will run. Common choices are: + <variablelist> + <varlistentry> + <term><varname>pkgs.virtualbox</varname></term> + <listitem><para> + The VirtualBox virtual machine framework. Required by some BOINC + projects, such as ATLAS@home. + </para></listitem> + </varlistentry> + <varlistentry> + <term><varname>pkgs.ocl-icd</varname></term> + <listitem><para> + OpenCL infrastructure library. Required by BOINC projects that + use OpenCL, in addition to a device-specific OpenCL driver. + </para></listitem> + </varlistentry> + <varlistentry> + <term><varname>pkgs.linuxPackages.nvidia_x11</varname></term> + <listitem><para> + Provides CUDA libraries. Required by BOINC projects that use + CUDA. Note that this requires an NVIDIA graphics device to be + present on the system. + </para><para> + Also provides OpenCL drivers for NVIDIA GPUs; + <varname>pkgs.ocl-icd</varname> is also needed in this case. + </para></listitem> + </varlistentry> + </variablelist> + ''; + }; }; config = mkIf cfg.enable { @@ -70,7 +114,7 @@ in chown boinc ${cfg.dataDir} ''; script = '' - ${cfg.package}/bin/boinc_client --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag} + ${fhsEnvExecutable} --dir ${cfg.dataDir} --redirectio ${allowRemoteGuiRpcFlag} ''; serviceConfig = { PermissionsStartOnly = true; # preStart must be run as root |