Unverified Commit 7c46cfbc authored by Orivej Desh's avatar Orivej Desh Committed by GitHub
Browse files

qtwebkit: fix linux build with glib 2.68 (#122259)

parent 0c046159

pkgs/development/libraries/qt-5/5.12/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -98,6 +98,11 @@ let 
        url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";

        sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";

      })

      (fetchpatch {

        name = "qtwebkit-glib-2.68.patch";

        url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch";

        sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0";

      })

      ./qtwebkit.patch

      ./qtwebkit-icu68.patch

pkgs/development/libraries/qt-5/5.14/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -111,6 +111,11 @@ let 
        url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";

        sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";

      })

      (fetchpatch {

        name = "qtwebkit-glib-2.68.patch";

        url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch";

        sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0";

      })

      ./qtwebkit.patch

      ./qtwebkit-icu68.patch

    ] ++ optionals stdenv.isDarwin [

pkgs/development/libraries/qt-5/5.15/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -135,6 +135,11 @@ let 
        url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch";

        sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";

      })

      (fetchpatch {

        name = "qtwebkit-glib-2.68.patch";

        url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch";

        sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0";

      })

      ./qtwebkit.patch

      ./qtwebkit-icu68.patch

    ] ++ optionals stdenv.isDarwin [