From 49ce5095590c0008694e0c8d5a0f03ad8c04201b Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 5 May 2021 13:52:52 -0700 Subject: [PATCH] jenkins: Create the `jenkins-cli` command Signed-off-by: Pamplemousse (cherry picked from commit 6f6c649ec606d6ec5bd5874002fda6efb568e9ec) --- .../continuous-integration/jenkins/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index a128db527df..88156f815ab 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix -, nixfmt, writeScript, nixosTests, jq, cacert, curl }: +{ lib, stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, makeWrapper, nix +, nixfmt, openjdk, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; @@ -10,9 +10,19 @@ stdenv.mkDerivation rec { sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf"; }; + nativeBuildInputs = [ makeWrapper ]; + buildCommand = '' - mkdir -p "$out/webapps" + mkdir -p "$out/bin" "$out/share" "$out/webapps" + cp "$src" "$out/webapps/jenkins.war" + + # Create the `jenkins-cli` command. + ${openjdk}/bin/jar -xf "$src" WEB-INF/lib/cli-${version}.jar \ + && mv WEB-INF/lib/cli-${version}.jar "$out/share/jenkins-cli.jar" + + makeWrapper "${openjdk}/bin/java" "$out/bin/jenkins-cli" \ + --add-flags "-jar $out/share/jenkins-cli.jar" ''; passthru = {