From 1e498cb0286ca624d161c7607e363182962dc57c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 16 Nov 2021 16:19:48 +0100 Subject: jboss-mysql-jdbc: remove build.sh --- pkgs/servers/http/jboss/jdbc/mysql/builder.sh | 5 ----- pkgs/servers/http/jboss/jdbc/mysql/default.nix | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 pkgs/servers/http/jboss/jdbc/mysql/builder.sh diff --git a/pkgs/servers/http/jboss/jdbc/mysql/builder.sh b/pkgs/servers/http/jboss/jdbc/mysql/builder.sh deleted file mode 100644 index 6af39a0cb63..00000000000 --- a/pkgs/servers/http/jboss/jdbc/mysql/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -buildInputs="$mysql_jdbc" -source $stdenv/setup - -mkdir -p $out/server/default/lib -ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/server/default/lib/mysql-connector-java.jar diff --git a/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/pkgs/servers/http/jboss/jdbc/mysql/default.nix index 8db1b7a2d04..078ae4d5114 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/default.nix +++ b/pkgs/servers/http/jboss/jdbc/mysql/default.nix @@ -2,13 +2,21 @@ stdenv.mkDerivation { pname = "jboss-mysql-jdbc"; + inherit (mysql_jdbc) version; - builder = ./builder.sh; + dontUnpack = true; - inherit mysql_jdbc; - version = mysql_jdbc.version; + installPhase = '' + runHook preInstall - meta = { - platforms = lib.platforms.unix; + mkdir -p $out/server/default/lib + ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/server/default/lib/mysql-connector-java.jar + + runHook postInstall + ''; + + meta = with lib; { + inherit (mysql_jdbc.meta) description license platforms homepage; + maintainers = with maintainers; [ ]; }; } -- cgit 1.4.1