about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-03-18 08:53:51 +0000
committerGitHub <noreply@github.com>2018-03-18 08:53:51 +0000
commit2d28d19edd73850cc2de9455ca8a49d0c23c0124 (patch)
tree4343ba400a50bd1b02ab7851d85be0e991a0af80 /nixos
parent9495c9218c777d001fcc35da1325a1e048e5ec49 (diff)
parent28a55f5bd60c5f21139de58ee01eb90e25b20b9d (diff)
downloadnixlib-2d28d19edd73850cc2de9455ca8a49d0c23c0124.tar
nixlib-2d28d19edd73850cc2de9455ca8a49d0c23c0124.tar.gz
nixlib-2d28d19edd73850cc2de9455ca8a49d0c23c0124.tar.bz2
nixlib-2d28d19edd73850cc2de9455ca8a49d0c23c0124.tar.lz
nixlib-2d28d19edd73850cc2de9455ca8a49d0c23c0124.tar.xz
nixlib-2d28d19edd73850cc2de9455ca8a49d0c23c0124.tar.zst
nixlib-2d28d19edd73850cc2de9455ca8a49d0c23c0124.zip
Merge pull request #37297 from coreyoconnor/jenkins-fonts
Add Deja-Vu fonts to jenkins environment and run as AWT headless
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/continuous-integration/jenkins/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 54047a50caa6..c2f4e9c0c5a7 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -145,6 +145,11 @@ in {
   };
 
   config = mkIf cfg.enable {
+    # server references the dejavu fonts
+    environment.systemPackages = [
+      pkgs.dejavu_fonts
+    ];
+
     users.extraGroups = optional (cfg.group == "jenkins") {
       name = "jenkins";
       gid = config.ids.gids.jenkins;
@@ -200,10 +205,12 @@ in {
           ${replacePlugins}
         '';
 
+      # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript
       script = ''
         ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
                                                   --httpPort=${toString cfg.port} \
                                                   --prefix=${cfg.prefix} \
+                                                  -Djava.awt.headless=true \
                                                   ${concatStringsSep " " cfg.extraOptions}
       '';