Unverified Commit e78a9a3b authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #221675 from wineee/qt5platform-plugins 

deepin.qt5platform-plugins: 5.6.3 -> 5.6.5
parents ede6b217 01285fcc

pkgs/desktops/deepin/library/qt5platform-plugins/default.nix

+16 −11
Original line number Diff line number Diff line
@@ -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";