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

Merge pull request #30623 from jerith666/webkit-icu

Browse Source 
webkitgtk 2.4: fixup build by using older icu again
This commit is contained in:
Peter Hoeg 2017-10-23 13:41:09 +08:00 committed by GitHub
commit 9b847750a2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8598,6 +8598,9 @@ with pkgs;
withIcu = true; withIcu = true;
withGraphite2 = true; withGraphite2 = true;
}; };
harfbuzz-icu-58 = harfbuzz-icu.override {
icu = icu58;
};
hawknl = callPackage ../development/libraries/hawknl { }; hawknl = callPackage ../development/libraries/hawknl { };
@ -10929,7 +10932,7 @@ with pkgs;
webkitgtk = webkitgtk216x; webkitgtk = webkitgtk216x;
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzz-icu; harfbuzz = harfbuzz-icu-58;
gst-plugins-base = gst_all_1.gst-plugins-base; gst-plugins-base = gst_all_1.gst-plugins-base;
inherit (darwin) libobjc; inherit (darwin) libobjc;
}; };