Merge pull request #244146 from GiggleSquid/pkgs/boinc-headless

boinc: add headless option
This commit is contained in:
Pol Dellaiera 2023-07-29 12:52:12 +02:00 committed by GitHub
commit cb8e68fd59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View file

@ -31,6 +31,7 @@ in
type = types.package;
default = pkgs.boinc;
defaultText = literalExpression "pkgs.boinc";
example = literalExpression "pkgs.boinc-headless";
description = lib.mdDoc ''
Which BOINC package to use.
'';

View file

@ -22,6 +22,7 @@
, libnotify
, libX11
, libxcb
, headless ? false
}:
stdenv.mkDerivation rec {
@ -40,6 +41,9 @@ stdenv.mkDerivation rec {
buildInputs = [
curl
sqlite
patchelf
] ++ lib.optionals (!headless) [
libGLU
libGL
libXmu
@ -47,17 +51,15 @@ stdenv.mkDerivation rec {
freeglut
libjpeg
wxGTK32
sqlite
gtk3
libXScrnSaver
libnotify
patchelf
libX11
libxcb
xcbutil
];
NIX_LDFLAGS = "-lX11";
NIX_LDFLAGS = lib.optionalString (!headless) "-lX11";
preConfigure = ''
./_autosetup
@ -66,7 +68,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = [ "--disable-server" ];
configureFlags = [ "--disable-server" ] ++ lib.optionals headless [ "--disable-manager" ];
postInstall = ''
install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"

View file

@ -39410,6 +39410,8 @@ with pkgs;
boinc = callPackage ../applications/science/misc/boinc { };
boinc-headless = callPackage ../applications/science/misc/boinc { headless = true; };
celestia = callPackage ../applications/science/astronomy/celestia {
autoreconfHook = buildPackages.autoreconfHook269;
inherit (gnome2) gtkglext;