logstash: fix missing package hooks
logstash packages were failing to run the pre/postInstall hooks, despite running the install phase.
This commit is contained in:
parent
442f53fc01
commit
979e2c252a
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
|
cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
|
||||||
|
|
||||||
@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
wrapProgram $out/bin/logstash-plugin \
|
wrapProgram $out/bin/logstash-plugin \
|
||||||
--set JAVA_HOME "${jre}"
|
--set JAVA_HOME "${jre}"
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
|
cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out
|
||||||
|
|
||||||
@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
wrapProgram $out/bin/logstash-plugin \
|
wrapProgram $out/bin/logstash-plugin \
|
||||||
--set JAVA_HOME "${jre}"
|
--set JAVA_HOME "${jre}"
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{ stdenv, lib, fetchzip }:
|
{ stdenv, lib, fetchzip }:
|
||||||
|
|
||||||
# Note that plugins are supposed to be installed as:
|
# Note that plugins are supposed to be installed as:
|
||||||
# $path/logstash/{inputs,codecs,filters,outputs}/*.rb
|
# $path/logstash/{inputs,codecs,filters,outputs}/*.rb
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.4.2";
|
version = "1.4.2";
|
||||||
pname = "logstash-contrib";
|
pname = "logstash-contrib";
|
||||||
@ -17,8 +17,10 @@ stdenv.mkDerivation rec {
|
|||||||
dontPatchShebangs = true;
|
dontPatchShebangs = true;
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
mkdir -p $out/logstash
|
mkdir -p $out/logstash
|
||||||
cp -r lib/* $out
|
cp -r lib/* $out
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
Loading…
Reference in New Issue
Block a user