diff options
| author | Isaac van Bakel <ivb@vanbakel.io> | 2020-11-26 16:10:07 +0000 |
|---|---|---|
| committer | Matthieu Coudron <teto@users.noreply.github.com> | 2020-11-26 19:43:28 +0100 |
| commit | 979e2c252ac5a8b57bc3608dde475a011b4d2d24 (patch) | |
| tree | 956e2d8fde1beb48bd8ff933671d89274a23b64d /pkgs/tools/misc/logstash | |
| parent | 442f53fc010a46fe24f34a476a0b99b1405807eb (diff) | |
logstash: fix missing package hooks
logstash packages were failing to run the pre/postInstall hooks, despite running the install phase.
Diffstat (limited to 'pkgs/tools/misc/logstash')
| -rw-r--r-- | pkgs/tools/misc/logstash/6.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/logstash/7.x.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/logstash/contrib.nix | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index 52e74e5babf5a..b8008864bccfd 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $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 \ --set JAVA_HOME "${jre}" + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index e7872b0c4061d..cd554167dda88 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall mkdir -p $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 \ --set JAVA_HOME "${jre}" + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index d03e031b7aeec..d4fb6532ef593 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchzip }: # 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 { version = "1.4.2"; pname = "logstash-contrib"; @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; installPhase = '' + runHook preInstall mkdir -p $out/logstash cp -r lib/* $out + runHook postInstall ''; meta = with lib; { |