about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/libraries/languagemachines/packages.nix12
-rw-r--r--pkgs/top-level/all-packages.nix4
2 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/libraries/languagemachines/packages.nix b/pkgs/development/libraries/languagemachines/packages.nix
index c2d449ed13c69..8a490bbc98670 100644
--- a/pkgs/development/libraries/languagemachines/packages.nix
+++ b/pkgs/development/libraries/languagemachines/packages.nix
@@ -1,13 +1,17 @@
-{ callPackage }:
+{ pkgs }:
+let
+  inherit (pkgs) callPackage;
+  icu = pkgs.icu60;
+in
 {
   ticcutils = callPackage ./ticcutils.nix { };
-  libfolia = callPackage ./libfolia.nix { };
-  ucto = callPackage ./ucto.nix { };
+  libfolia = callPackage ./libfolia.nix { inherit icu; };
+  ucto = callPackage ./ucto.nix { inherit icu; };
   uctodata = callPackage ./uctodata.nix { };
   timbl = callPackage ./timbl.nix { };
   timblserver = callPackage ./timblserver.nix { };
   mbt = callPackage ./mbt.nix { };
-  frog = callPackage ./frog.nix { };
+  frog = callPackage ./frog.nix { inherit icu; };
   frogdata = callPackage ./frogdata.nix { };
 
   test = callPackage ./test.nix { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d3f900b5a676..2db3c3fe43123 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11268,7 +11268,9 @@ in
     stdenv = gccStdenv;
   };
 
-  languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; });
+  languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix {
+    inherit pkgs;
+  });
 
   lasem = callPackage ../development/libraries/lasem { };