qt5platform-plugins: 5.6.9 -> 5.6.16

rewine 5a095678 b13b1c40

+25 -15
+25 -15
pkgs/desktops/deepin/library/qt5platform-plugins/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 - , qmake 4 + , fetchpatch 5 + , cmake 6 + , extra-cmake-modules 5 7 , pkg-config 8 + , dtkcommon 6 9 , qtbase 7 10 , qtx11extras 8 - , wrapQtAppsHook 9 11 , mtdev 10 12 , cairo 11 13 , xorg 12 - , waylandSupport ? true 13 14 , wayland 15 + , dwayland 16 + , qtwayland 14 17 }: 15 18 16 19 stdenv.mkDerivation rec { 17 20 pname = "qt5platform-plugins"; 18 - version = "5.6.9"; 21 + version = "5.6.16"; 19 22 20 23 src = fetchFromGitHub { 21 24 owner = "linuxdeepin"; 22 25 repo = pname; 23 26 rev = version; 24 - sha256 = "sha256-EG5M4rcMK62DX4ywm2IH0lGHC510BnMqcefMlF9pyr8="; 27 + hash = "sha256-1/biT8wR44+sdOMhBW/8KMUSBDK/UxuEqsyjTZyjBT4="; 25 28 }; 26 29 27 30 nativeBuildInputs = [ 28 - qmake 31 + cmake 32 + extra-cmake-modules 29 33 pkg-config 30 - wrapQtAppsHook 31 34 ]; 32 35 33 36 buildInputs = [ 37 + dtkcommon 34 38 mtdev 35 39 cairo 36 40 qtbase 37 41 qtx11extras 38 42 xorg.libSM 39 - ] 40 - ++ lib.optionals waylandSupport [ 41 43 wayland 44 + dwayland 45 + qtwayland 42 46 ]; 43 47 44 - qmakeFlags = [ 45 - "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" 46 - "QT_XCB_PRIVATE_INCLUDE=${qtbase.src}/src/plugins/platforms/xcb" 47 - ] 48 - ++ lib.optionals (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; 48 + patches = [ 49 + (fetchpatch { 50 + name = "use-ECM-to-help-dwayland-find-wayland.patch"; 51 + url = "https://github.com/linuxdeepin/qt5platform-plugins/commit/d7f6230716a0ff5ce34fc7d292ec0af5bbac30e4.patch"; 52 + hash = "sha256-RY2+QBR3OjUGBX4Y9oVvIRY90IH9rTOCg8dCddkB2WE="; 53 + }) 54 + ]; 49 55 56 + cmakeFlags = [ 57 + "-DINSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" 58 + "-DQT_XCB_PRIVATE_HEADERS=${qtbase.src}/src/plugins/platforms/xcb" 59 + ]; 50 60 51 - env.NIX_CFLAGS_COMPILE = lib.optionalString waylandSupport "-I${wayland.dev}/include"; 61 + dontWrapQtApps = true; 52 62 53 63 meta = with lib; { 54 64 description = "Qt platform plugins for DDE";