syncthingtray: support building with qt6
This commit is contained in:
parent
ce77225e21
commit
606c879892
@ -1,9 +1,8 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, substituteAll
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtwebengine
|
||||
, qtdeclarative
|
||||
, extra-cmake-modules
|
||||
@ -46,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtsvg
|
||||
cpp-utilities
|
||||
qtutilities
|
||||
boost
|
||||
@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
doCheck = !stdenv.isDarwin;
|
||||
preCheck = ''
|
||||
export QT_QPA_PLATFORM=offscreen
|
||||
export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}"
|
||||
export QT_PLUGIN_PATH="${lib.getBin qtbase}/${qtbase.qtPluginPrefix}"
|
||||
'';
|
||||
# don't test --help on Darwin because output is .app
|
||||
doInstallCheck = !stdenv.isDarwin;
|
||||
@ -83,6 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}"
|
||||
"-DKF_PACKAGE_PREFIX=KF${lib.versions.major qtbase.version}"
|
||||
"-DBUILD_TESTING=ON"
|
||||
# See https://github.com/Martchus/syncthingtray/issues/208
|
||||
"-DEXCLUDE_TESTS_FROM_ALL=OFF"
|
||||
|
@ -35322,6 +35322,10 @@ with pkgs;
|
||||
plasmoidSupport = false;
|
||||
systemdSupport = true;
|
||||
};
|
||||
syncthingtray-qt6 = kdePackages.callPackage ../applications/misc/syncthingtray {
|
||||
# renamed in KF5 -> KF6
|
||||
plasma-framework = kdePackages.libplasma;
|
||||
};
|
||||
|
||||
synergy = libsForQt5.callPackage ../applications/misc/synergy {
|
||||
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
|
||||
|
Loading…
Reference in New Issue
Block a user