diff options
Diffstat (limited to 'pkgs/development/libraries/qt-6/default.nix')
-rw-r--r-- | pkgs/development/libraries/qt-6/default.nix | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 0dd6cd75df0..bef3f7ef62e 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -9,6 +9,7 @@ , gst_all_1 , libglvnd , darwin +, overrideSDK , buildPackages , python3 @@ -49,11 +50,11 @@ let ./patches/0004-qtbase-fix-locating-tzdir-on-NixOS.patch ./patches/0005-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch ./patches/0006-qtbase-qt-cmake-always-use-cmake-from-path.patch - ./patches/0007-qtbase-find-qt-tools-in-QTTOOLSPATH.patch - ./patches/0008-qtbase-allow-translations-outside-prefix.patch - ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-environment.patch - ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-actuall.patch - ./patches/0010-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch + ./patches/0007-qtbase-find-tools-in-PATH.patch + ./patches/0008-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch + ./patches/0009-qtbase-allow-translations-outside-prefix.patch + ./patches/0010-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch + ./patches/0011-qtbase-check-in-the-QML-folder-of-this-library-does-.patch ]; }; env = callPackage ./qt-env.nix { }; @@ -65,6 +66,7 @@ let qtdatavis3d qtdeclarative qtdoc + qtgraphs qtgrpc qthttpserver qtimageformats @@ -105,15 +107,8 @@ let qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; qtdoc = callPackage ./modules/qtdoc.nix { }; - qtgrpc = callPackage ./modules/qtgrpc.nix { - patches = [ - (fetchpatch2 { - # fix compatibility with protobuf 23 - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/d6b33bd915dc6e63b30db2cd29150d55b289d7ed/protobuf-23.patch"; - hash = "sha256-KQAcrjQ3rK9pDQUOUK6AS4ej8YvtRv9WZOxby31Y5r4="; - }) - ]; - }; + qtgraphs = callPackage ./modules/qtgraphs.nix { }; + qtgrpc = callPackage ./modules/qtgrpc.nix { }; qthttpserver = callPackage ./modules/qthttpserver.nix { }; qtimageformats = callPackage ./modules/qtimageformats.nix { }; qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { }; @@ -147,13 +142,18 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) bootstrap_cmds cctools xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind llvmPackages_14; + inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; + qtModule = qtModule.override { + stdenv = if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + else stdenv; + }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; @@ -184,12 +184,12 @@ let # simple example of how to do that in 5568a4d25ca406809530420996d57e0876ca1a01 baseScope = lib.makeScope newScope addPackages; - bootstrapScope = baseScope.overrideScope'(final: prev: { + bootstrapScope = baseScope.overrideScope(final: prev: { qtbase = prev.qtbase.override { qttranslations = null; }; qtdeclarative = null; }); - finalScope = baseScope.overrideScope'(final: prev: { + finalScope = baseScope.overrideScope(final: prev: { qttranslations = bootstrapScope.qttranslations; }); in finalScope |