public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65677 from JohnAZoidberg/fix-frog

Browse Source 
frog: Fix build (icu64 -> icu60)
This commit is contained in:
Robert Hensing 2019-08-01 11:27:01 +02:00 committed by GitHub
commit 2bd9aac158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/languagemachines/packages.nix
View File

@ -1,13 +1,17 @@
{ callPackage }: { pkgs }:
let
inherit (pkgs) callPackage;
icu = pkgs.icu60;
in
{ {
ticcutils = callPackage ./ticcutils.nix { }; ticcutils = callPackage ./ticcutils.nix { };
libfolia = callPackage ./libfolia.nix { }; libfolia = callPackage ./libfolia.nix { inherit icu; };
ucto = callPackage ./ucto.nix { }; ucto = callPackage ./ucto.nix { inherit icu; };
uctodata = callPackage ./uctodata.nix { }; uctodata = callPackage ./uctodata.nix { };
timbl = callPackage ./timbl.nix { }; timbl = callPackage ./timbl.nix { };
timblserver = callPackage ./timblserver.nix { }; timblserver = callPackage ./timblserver.nix { };
mbt = callPackage ./mbt.nix { }; mbt = callPackage ./mbt.nix { };
frog = callPackage ./frog.nix { }; frog = callPackage ./frog.nix { inherit icu; };
frogdata = callPackage ./frogdata.nix { }; frogdata = callPackage ./frogdata.nix { };
test = callPackage ./test.nix { }; test = callPackage ./test.nix { };

4
pkgs/top-level/all-packages.nix
View File

@ -11272,7 +11272,9 @@ in
stdenv = gccStdenv; 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 { }; lasem = callPackage ../development/libraries/lasem { };