Unverified Commit 8eb4e86a authored by Bjørn Forsman's avatar Bjørn Forsman Committed by GitHub
Browse files

qt5.qtwebengine: Pin to GCC 14 (#479108)

parents fb34f684 6e27bc91

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

+26 −14
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
  generateSplicesForMkScope,

  lib,

  stdenv,

  gcc14Stdenv,

  fetchurl,

  fetchgit,

  fetchpatch,
@@ -246,12 +247,15 @@ let 
  addPackages =

    self:

    let

      qtModule = callPackage ../qtModule.nix {

      qtModuleWithStdenv =

        stdenv:

        callPackage ../qtModule.nix {

          inherit patches;

          # Use a variant of mkDerivation that does not include wrapQtApplications

          # to avoid cyclic dependencies between Qt modules.

          mkDerivation = (callPackage ../mkDerivation.nix { wrapQtAppsHook = null; }) stdenv.mkDerivation;

        };

      qtModule = qtModuleWithStdenv stdenv;



      callPackage = self.newScope {

        inherit
@@ -326,12 +330,20 @@ let 
      qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix { };

      qtwayland = callPackage ../modules/qtwayland.nix { };

      qtwebchannel = callPackage ../modules/qtwebchannel.nix { };

      qtwebengine = callPackage ../modules/qtwebengine.nix {

      qtwebengine =

        # Actually propagating stdenv change

        let

          # Won’t build with Clang 20, as `-Wenum-constexpr-conversion`

          # was made a hard error.

        stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv;

          # qt5webengine no longer maintained, FTBFS with GCC 15

          stdenv' = if stdenv.cc.isClang then llvmPackages_19.stdenv else gcc14Stdenv;

          qtModule' = qtModuleWithStdenv stdenv';

        in

        callPackage ../modules/qtwebengine.nix {

          inherit (srcs.qtwebengine) version;

          inherit (darwin) bootstrap_cmds;

          stdenv = stdenv';

          qtModule = qtModule';

          python = python3;

        };

      qtwebglplugin = callPackage ../modules/qtwebglplugin.nix { };

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -7912,6 +7912,7 @@ with pkgs; 
        generateSplicesForMkScope

        lib

        stdenv

        gcc14Stdenv

        fetchurl

        fetchpatch

        fetchgit