public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37297 from coreyoconnor/jenkins-fonts

Browse Source 
Add Deja-Vu fonts to jenkins environment and run as AWT headless
This commit is contained in:
Jörg Thalheim 2018-03-18 08:53:51 +00:00 committed by GitHub
commit 2d28d19edd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/continuous-integration/jenkins/default.nix
View File

@ -145,6 +145,11 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
# server references the dejavu fonts
environment.systemPackages = [
pkgs.dejavu_fonts
];
users.extraGroups = optional (cfg.group == "jenkins") { users.extraGroups = optional (cfg.group == "jenkins") {
name = "jenkins"; name = "jenkins";
gid = config.ids.gids.jenkins; gid = config.ids.gids.jenkins;
@ -200,10 +205,12 @@ in {
${replacePlugins} ${replacePlugins}
''; '';
# For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
script = '' script = ''
${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
--httpPort=${toString cfg.port} \ --httpPort=${toString cfg.port} \
--prefix=${cfg.prefix} \ --prefix=${cfg.prefix} \
-Djava.awt.headless=true \
${concatStringsSep " " cfg.extraOptions} ${concatStringsSep " " cfg.extraOptions}
''; '';