From 08eba842b071971dd42df24e12160a1d78f7c3b4 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 7 May 2018 19:28:13 +0200 Subject: [PATCH 1/2] graylog: 2.4.3 -> 2.4.4 --- pkgs/tools/misc/graylog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index b9945a3afd3..cc7addb668e 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.4.3"; + version = "2.4.4"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0kwgg9m9sqzl4y2ri69fpi7w9961psbmfdq3avjsbgbs60ly1hn6"; + sha256 = "0wiqwwsy306hr7zn57f5hvh8wvcc2q46x0hdlabi0n9m44wk993i"; }; dontBuild = true; From 9817b4aa5f6a1a2ee44866bd77ef72132a0b8891 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Tue, 8 May 2018 15:48:18 +0200 Subject: [PATCH 2/2] graylog: wrap graylogctl Wrapper ensures graylogctl script can find java --- pkgs/tools/misc/graylog/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index cc7addb668e..f79be961378 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { version = "2.4.4"; @@ -12,9 +12,13 @@ stdenv.mkDerivation rec { dontBuild = true; dontStrip = true; + buildInputs = [ makeWrapper ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ]; + installPhase = '' mkdir -p $out cp -r {graylog.jar,lib,bin,plugin,data} $out + wrapProgram $out/bin/graylogctl $makeWrapperArgs ''; meta = with stdenv.lib; {