diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index ae3f186c1d0..7da49fa0aaa 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} --httpListenAddress=${cfg.listenAddress} \ + ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/lib/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 827fb4e05a5..cbc2b76d8ac 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -8,6 +8,12 @@ stdenv.mkDerivation rec { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; sha256 = "0x59dbvh6y25ki5jy51djbfbhf8g2j3yd9f3n66f7bkdfw8p78g1"; }; + + buildCommand = '' + mkdir -p "$out/lib" + cp "$src" "$out/lib/jenkins.war" + ''; + meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; homepage = http://jenkins-ci.org; @@ -15,6 +21,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = [ maintainers.coconnor ]; }; - - buildCommand = "cp $src $out"; }