From 04a4175ff7e6a3802d050c8d7c1d7695863c7f87 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 16 Nov 2021 16:24:18 +0100 Subject: [PATCH] tomcat-mysql-jdbc: remove build.sh --- pkgs/servers/http/tomcat/jdbc/mysql/builder.sh | 4 ---- pkgs/servers/http/tomcat/jdbc/mysql/default.nix | 15 +++++++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 pkgs/servers/http/tomcat/jdbc/mysql/builder.sh 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 14829c5e85d..00000000000 --- 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 7585cabccd1..9e6f346a0ec 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; };