From b63adda96a27cd8e7665df91c3d7d0fb734b69dd Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 13 Apr 2019 11:16:35 -0500 Subject: [PATCH] fltrdr: 0.2.1 -> 0.3.1 * now needs openssl * needs newer icu than default, 63 works --- pkgs/tools/misc/fltrdr/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index b18e9d96706..a72279b90b6 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -1,22 +1,23 @@ { stdenv , fetchFromGitHub , cmake -, icu +, icu, openssl }: stdenv.mkDerivation rec { name = "fltrdr-${version}"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { repo = "fltrdr"; owner = "octobanana"; rev = "${version}"; - sha256 = "0hj7pwb93l4ahykmmr0665nq50jvwdq0aiaciz82225aw1cq939w"; + sha256 = "1vpci7vqzcpdd21zgigyz38k77r9fc81dmiwsvfr8w7gad5sg6sj"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ icu ]; + + buildInputs = [ icu openssl ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9602bbe3ad7..03c0bb6e540 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2897,7 +2897,10 @@ in flatpak-builder = callPackage ../development/tools/flatpak-builder { }; - fltrdr = callPackage ../tools/misc/fltrdr { stdenv = gcc8Stdenv; }; + fltrdr = callPackage ../tools/misc/fltrdr { + stdenv = gcc8Stdenv; + icu = icu63; + }; fluent-bit = callPackage ../tools/misc/fluent-bit { stdenv = gccStdenv;