diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-17 22:07:53 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-17 22:07:53 +0200 |
commit | e78a9a3b2b866c863e27b7c765a3e0d9d4b10049 (patch) | |
tree | 3cb21d84fb7e6cfadc21114659ed4db14a0e86c9 /pkgs/desktops/deepin | |
parent | ede6b217a157b3f6c1960d2f8f384cb08b7b3f31 (diff) | |
parent | 01285fcc4994d7bf1a3e06db62613f7d7be87bce (diff) |
Merge pull request #221675 from wineee/qt5platform-plugins
deepin.qt5platform-plugins: 5.6.3 -> 5.6.5
Diffstat (limited to 'pkgs/desktops/deepin')
-rw-r--r-- | pkgs/desktops/deepin/library/qt5platform-plugins/default.nix | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix index 1a1d8661563ad..272a7b9d87007 100644 --- a/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix +++ b/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -9,28 +9,26 @@ , mtdev , cairo , xorg -, waylandSupport ? false +, waylandSupport ? true +, wayland }: stdenv.mkDerivation rec { pname = "qt5platform-plugins"; - version = "5.6.3"; + version = "5.6.5"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk="; + sha256 = "sha256-DHgnfJTUw1hY53DmDfzVFM6Ff8q6pbNDPmPeSsV7MwY="; }; - ## https://github.com/linuxdeepin/qt5platform-plugins/pull/119 - postPatch = '' - rm -r xcb/libqt5xcbqpa-dev/ - mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version} - cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/ - ''; - - nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; buildInputs = [ mtdev @@ -38,13 +36,20 @@ stdenv.mkDerivation rec { qtbase qtx11extras xorg.libSM + ] + ++ lib.optionals waylandSupport [ + wayland ]; qmakeFlags = [ "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" + "QT_XCB_PRIVATE_INCLUDE=${qtbase.src}/src/plugins/platforms/xcb" ] ++ lib.optionals (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString waylandSupport "-I${wayland.dev}/include"; + meta = with lib; { description = "Qt platform plugins for DDE"; homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; |