talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

qt6: fixate the Linux version (#401073)

Browse Source
This commit is contained in:
K900 2025-04-23 16:40:27 +03:00 committed by GitHub
commit dd36c9b0d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/qt-6/modules/qtbase/default.nix
View File

@ -263,6 +263,9 @@ stdenv.mkDerivation rec {
"-DQT_FEATURE_system_sqlite=ON" "-DQT_FEATURE_system_sqlite=ON"
"-DQT_FEATURE_openssl_linked=ON" "-DQT_FEATURE_openssl_linked=ON"
"-DQT_FEATURE_vulkan=ON" "-DQT_FEATURE_vulkan=ON"
# don't leak OS version into the final output
# https://bugreports.qt.io/browse/QTBUG-136060
"-DCMAKE_SYSTEM_VERSION="
] ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
"-DQT_FEATURE_sctp=ON" "-DQT_FEATURE_sctp=ON"

7
pkgs/development/libraries/qt-6/qtModule.nix
View File

@ -39,8 +39,11 @@ stdenv.mkDerivation (
++ (args.propagatedBuildInputs or [ ]); ++ (args.propagatedBuildInputs or [ ]);
cmakeFlags = cmakeFlags =
args.cmakeFlags or [ ] # don't leak OS version into the final output
++ lib.optional stdenv.hostPlatform.isDarwin "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"; # https://bugreports.qt.io/browse/QTBUG-136060
[ "-DCMAKE_SYSTEM_VERSION=" ]
++ lib.optional stdenv.hostPlatform.isDarwin "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
++ args.cmakeFlags or [ ];
moveToDev = false; moveToDev = false;