From 3f99b556de2a23347dd6160430a98cc6c7d2097d Mon Sep 17 00:00:00 2001 From: Jack Connors Date: Tue, 18 Jul 2023 11:44:27 +0100 Subject: [PATCH] boinc: add headless option Added headless option and packages entry. Switches config flag --disable-manager and omits X/GUI related libs --- pkgs/applications/science/misc/boinc/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 625de3a3a8b3..f806be834bca 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39f4d3a3aa04..31ed8675704e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39259,6 +39259,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;