pyrox.dev / nixpkgs
lol
fork atom

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

boinc: add headless option

authored by

Pol Dellaiera and committed by
GitHub cb8e68fd 09f59ad9

+9 -4
unified split
+1
nixos/modules/services/computing/boinc/client.nix
··· 31 31 type = types.package; 32 32 default = pkgs.boinc; 33 33 defaultText = literalExpression "pkgs.boinc"; 34 + example = literalExpression "pkgs.boinc-headless"; 34 35 description = lib.mdDoc '' 35 36 Which BOINC package to use. 36 37 '';
+6 -4
pkgs/applications/science/misc/boinc/default.nix
··· 22 22 , libnotify 23 23 , libX11 24 24 , libxcb 25 + , headless ? false 25 26 }: 26 27 27 28 stdenv.mkDerivation rec { ··· 40 41 41 42 buildInputs = [ 42 43 curl 44 + sqlite 45 + patchelf 46 + ] ++ lib.optionals (!headless) [ 43 47 libGLU 44 48 libGL 45 49 libXmu ··· 47 51 freeglut 48 52 libjpeg 49 53 wxGTK32 50 - sqlite 51 54 gtk3 52 55 libXScrnSaver 53 56 libnotify 54 - patchelf 55 57 libX11 56 58 libxcb 57 59 xcbutil 58 60 ]; 59 61 60 - NIX_LDFLAGS = "-lX11"; 62 + NIX_LDFLAGS = lib.optionalString (!headless) "-lX11"; 61 63 62 64 preConfigure = '' 63 65 ./_autosetup ··· 66 68 67 69 enableParallelBuilding = true; 68 70 69 - configureFlags = [ "--disable-server" ]; 71 + configureFlags = [ "--disable-server" ] ++ lib.optionals headless [ "--disable-manager" ]; 70 72 71 73 postInstall = '' 72 74 install --mode=444 -D 'client/scripts/boinc-client.service' "$out/etc/systemd/system/boinc.service"
+2
pkgs/top-level/all-packages.nix
··· 39410 39410 39411 39411 boinc = callPackage ../applications/science/misc/boinc { }; 39412 39412 39413 + boinc-headless = callPackage ../applications/science/misc/boinc { headless = true; }; 39414 + 39413 39415 celestia = callPackage ../applications/science/astronomy/celestia { 39414 39416 autoreconfHook = buildPackages.autoreconfHook269; 39415 39417 inherit (gnome2) gtkglext;