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