From 8c2d8884013e6d8e929b35ba46e85e27cdb0ad33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 15 Jul 2016 16:57:16 +0200
Subject: [PATCH] jenkins: move $out/{lib => webapps}/jenkins.war

As pointed out by @danbst, the tomcat NixOS module expects packages
listed in services.tomcat.webapps to either be direct .war file paths or
have .war files inside a "webapps" directory.

Commit 4075c10a59af455db2012beb313453662f09dad0
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.
---
 .../services/continuous-integration/jenkins/default.nix       | 2 +-
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 7da49fa0aaab..4edbbf59a42c 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -154,7 +154,7 @@ in {
       '';
 
       script = ''
-        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/lib/jenkins.war --httpListenAddress=${cfg.listenAddress} \
+        ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
                                                   --httpPort=${toString cfg.port} \
                                                   --prefix=${cfg.prefix} \
                                                   ${concatStringsSep " " cfg.extraOptions}
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index cbc2b76d8acc..e7355d167d92 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   buildCommand = ''
-    mkdir -p "$out/lib"
-    cp "$src" "$out/lib/jenkins.war"
+    mkdir -p "$out/webapps"
+    cp "$src" "$out/webapps/jenkins.war"
   '';
 
   meta = with stdenv.lib; {