Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions pkgs/development/libraries/qt-5/5.15/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
generateSplicesForMkScope,
lib,
stdenv,
gcc14Stdenv,
fetchurl,
fetchgit,
fetchpatch,
Expand Down Expand Up @@ -246,12 +247,15 @@ let
addPackages =
self:
let
qtModule = 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;
};
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
Expand Down Expand Up @@ -326,14 +330,22 @@ let
qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix { };
qtwayland = callPackage ../modules/qtwayland.nix { };
qtwebchannel = callPackage ../modules/qtwebchannel.nix { };
qtwebengine = callPackage ../modules/qtwebengine.nix {
# 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;
inherit (srcs.qtwebengine) version;
inherit (darwin) bootstrap_cmds;
python = python3;
};
qtwebengine =
# Actually propagating stdenv change
let
# Won’t build with Clang 20, as `-Wenum-constexpr-conversion`
# was made a hard error.
# 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 { };
qtwebkit = callPackage ../modules/qtwebkit.nix { };
qtwebsockets = callPackage ../modules/qtwebsockets.nix { };
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8032,6 +8032,7 @@ with pkgs;
generateSplicesForMkScope
lib
stdenv
gcc14Stdenv
fetchurl
fetchpatch
fetchgit
Expand Down
Loading