diff options
| author | Peter Hoeg <peter@hoeg.com> | 2017-10-23 13:41:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 13:41:09 +0800 |
| commit | 9b847750a23865c4467ca90fcf46ab6795d88890 (patch) | |
| tree | e34133054d71a9f7089427cf695437c699e8bd98 /pkgs | |
| parent | fd3bb2589555c2c6f63251b977fdc655bd7d9c9b (diff) | |
| parent | 0f0d11074f9678a4e0160352ce3e8b49ad9f446f (diff) | |
| download | nixlib-9b847750a23865c4467ca90fcf46ab6795d88890.tar nixlib-9b847750a23865c4467ca90fcf46ab6795d88890.tar.gz nixlib-9b847750a23865c4467ca90fcf46ab6795d88890.tar.bz2 nixlib-9b847750a23865c4467ca90fcf46ab6795d88890.tar.lz nixlib-9b847750a23865c4467ca90fcf46ab6795d88890.tar.xz nixlib-9b847750a23865c4467ca90fcf46ab6795d88890.tar.zst nixlib-9b847750a23865c4467ca90fcf46ab6795d88890.zip | |
Merge pull request #30623 from jerith666/webkit-icu
webkitgtk 2.4: fixup build by using older icu again
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2e6cb87013e..d188df0b1487 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8598,6 +8598,9 @@ with pkgs; withIcu = true; withGraphite2 = true; }; + harfbuzz-icu-58 = harfbuzz-icu.override { + icu = icu58; + }; hawknl = callPackage ../development/libraries/hawknl { }; @@ -10929,7 +10932,7 @@ with pkgs; webkitgtk = webkitgtk216x; 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; inherit (darwin) libobjc; }; |