Merge pull request #62681 from dtzWill/update/fltrdr-0.3.1

fltrdr: 0.2.1 -> 0.3.1
NixOS · Jun 7, 2019 · 276dc23 · 276dc23
2 parents 380c5f5 + b63adda
commit 276dc23
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -2901,7 +2901,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;