From a66786ecba1381b70221c2ba3529c52d23e1de77 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 15 Aug 2023 19:10:20 +0200 Subject: [PATCH] opensearch: minor cleanup and reformat --- pkgs/servers/search/opensearch/default.nix | 31 ++++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index d43d2450d894..d32d77f0ae49 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -1,14 +1,12 @@ -{ lib +{ coreutils +, fetchurl +, gnugrep +, jre_headless +, lib +, makeBinaryWrapper +, nixosTests , stdenv , stdenvNoCC -, fetchurl -, makeWrapper -, jre_headless -, gnugrep -, coreutils -, autoPatchelfHook -, zlib -, nixosTests }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -20,8 +18,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-A9YjwtmacQDC8PrdyP/ai6J+roqmP/bz99rSM3votow="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre_headless ]; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + buildInputs = [ + jre_headless + ]; installPhase = '' runHook preInstall @@ -48,12 +51,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Open Source, Distributed, RESTful Search Engine"; homepage = "https://github.com/opensearch-project/OpenSearch"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ shyim ]; + platforms = lib.platforms.unix; sourceProvenance = with lib.sourceTypes; [ binaryBytecode binaryNativeCode ]; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ shyim ]; }; })