From 7dadbc7a986adeeb3027f49d0ea93bf1d162357f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 1 Feb 2020 19:25:52 +0100 Subject: [PATCH] confluence: Add support for MySQL driver If Confluence should be connected to a MySQL database, the JDBC driver is required. Also switch to stdenvNoCC, because we don't really use cc. --- pkgs/servers/atlassian/confluence.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index a5aead770b8a..c140e3ae3907 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -1,9 +1,12 @@ -{ stdenv, lib, fetchurl +{ stdenvNoCC, lib, fetchurl, mysql_jdbc ? null , enableSSO ? false , crowdProperties ? null +, withMysql ? true }: -stdenv.mkDerivation rec { +assert withMysql -> (mysql_jdbc != null); + +stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; version = "7.2.0"; @@ -28,6 +31,8 @@ stdenv.mkDerivation rec { cat < confluence/WEB-INF/classes/crowd.properties ${crowdProperties} EOF + '' + lib.optionalString withMysql '' + cp -v ${mysql_jdbc}/share/java/*jar confluence/WEB-INF/lib/ ''; installPhase = '' @@ -35,7 +40,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Team collaboration software written in Java and mainly used in corporate environments"; homepage = "https://www.atlassian.com/software/confluence"; license = licenses.unfree;