diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 23:29:34 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-11-30 23:29:34 +0100 |
| commit | 3a3513e7e7d4c252d6240a62d377ef723509d8c0 (patch) | |
| tree | f4549fa130a87a81bbc39a28414ec42d4aac283b /pkgs/top-level | |
| parent | 338b3fd11dd6f8aeea4d99e61e80a9f198fd1848 (diff) | |
| download | nixlib-3a3513e7e7d4c252d6240a62d377ef723509d8c0.tar nixlib-3a3513e7e7d4c252d6240a62d377ef723509d8c0.tar.gz nixlib-3a3513e7e7d4c252d6240a62d377ef723509d8c0.tar.bz2 nixlib-3a3513e7e7d4c252d6240a62d377ef723509d8c0.tar.lz nixlib-3a3513e7e7d4c252d6240a62d377ef723509d8c0.tar.xz nixlib-3a3513e7e7d4c252d6240a62d377ef723509d8c0.tar.zst nixlib-3a3513e7e7d4c252d6240a62d377ef723509d8c0.zip | |
webkitgtk220x: drop
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aee064f742b0..0036c182be7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12749,7 +12749,11 @@ with pkgs; wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = webkitgtk220x; + webkitgtk = callPackage ../development/libraries/webkitgtk { + harfbuzz = harfbuzzFull; + inherit (gst_all_1) gst-plugins-base gst-plugins-bad; + stdenv = overrideCC stdenv gcc6; + }; webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzzFull.override { @@ -12759,19 +12763,6 @@ with pkgs; inherit (darwin) libobjc; }; - webkitgtk220x = callPackage ../development/libraries/webkitgtk { - harfbuzz = harfbuzzFull; - inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = overrideCC stdenv gcc6; - }; - - webkitgtk222x = callPackage ../development/libraries/webkitgtk/2.22.nix { - harfbuzz = harfbuzzFull; - inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = overrideCC stdenv gcc6; - }; - - webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override { withGtk2 = true; enableIntrospection = false; |