Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-24.11] qt6.qtwebengine: fix build on darwin #372849

Merged
merged 2 commits into from
Jan 17, 2025
Merged

[release-24.11] qt6.qtwebengine: fix build on darwin #372849

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fd6509
qt6.qtwebengine: make the `AppleClang` substitution unconditional
azuwis Jan 11, 2025
9d9c626
qt6.qtwebengine: fix build on darwin
azuwis Jan 11, 2025
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
Next Next commit
qt6.qtwebengine: make the AppleClang substitution unconditional 
So we won't break darwin build if the package is updated
  • Loading branch information
@azuwis
azuwis committed Jan 11, 2025
commit 2fd6509a25b915b97ae4f5ea0d45256a0766d9d8
5 changes: 3 additions & 2 deletions pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ qtModule {
--replace "QLibraryInfo::path(QLibraryInfo::DataPath)" "\"$out\"" \
--replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \
--replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\""

substituteInPlace configure.cmake src/gn/CMakeLists.txt \
--replace "AppleClang" "Clang"
''
+ lib.optionalString stdenv.hostPlatform.isLinux ''
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \
Expand All @@ -139,8 +142,6 @@ qtModule {
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace configure.cmake src/gn/CMakeLists.txt \
--replace "AppleClang" "Clang"
substituteInPlace cmake/Functions.cmake \
--replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun"
'';
Expand Down