diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-11-17 13:39:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-17 13:39:28 +0100 |
| commit | 20091ed20532dd21110968c48a7b215aa777d1b4 (patch) | |
| tree | 97c43f0828637a2d9b67f6c95c5b11312747cb4e /pkgs/servers/http | |
| parent | 72ab57a1680364e5918fe50fc68d386c60fc3d5e (diff) | |
| parent | 04a4175ff7e6a3802d050c8d7c1d7695863c7f87 (diff) | |
Merge pull request #146254 from Stunkymonkey/tomcat-mysql-jdbc-builder
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/tomcat/jdbc/mysql/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/jdbc/mysql/default.nix | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh deleted file mode 100644 index 14829c5e85d81..0000000000000 --- a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/lib -ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix index 7585cabccd148..9e6f346a0ec4b 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix +++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix @@ -2,12 +2,19 @@ stdenv.mkDerivation { pname = "tomcat-mysql-jdbc"; - builder = ./builder.sh; - buildInputs = [ mysql_jdbc ]; - - inherit mysql_jdbc; version = mysql_jdbc.version; + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar + + runHook postInstall + ''; + meta = { platforms = lib.platforms.unix; }; |