colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syncthingtray: support building with qt6

Browse Source
This commit is contained in:
K900 2024-02-12 14:35:07 +03:00
parent ce77225e21
commit 606c879892
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/syncthingtray/default.nix
View File

@ -1,9 +1,8 @@
{ mkDerivation { lib
, lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, substituteAll
, qtbase , qtbase
, qtsvg
, qtwebengine , qtwebengine
, qtdeclarative , qtdeclarative
, extra-cmake-modules , extra-cmake-modules
@ -46,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
qtbase qtbase
qtsvg
cpp-utilities cpp-utilities
qtutilities qtutilities
boost boost
@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = !stdenv.isDarwin; doCheck = !stdenv.isDarwin;
preCheck = '' preCheck = ''
export QT_QPA_PLATFORM=offscreen 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 # don't test --help on Darwin because output is .app
doInstallCheck = !stdenv.isDarwin; doInstallCheck = !stdenv.isDarwin;
@ -83,6 +83,8 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
cmakeFlags = [ cmakeFlags = [
"-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}"
"-DKF_PACKAGE_PREFIX=KF${lib.versions.major qtbase.version}"
"-DBUILD_TESTING=ON" "-DBUILD_TESTING=ON"
# See https://github.com/Martchus/syncthingtray/issues/208 # See https://github.com/Martchus/syncthingtray/issues/208
"-DEXCLUDE_TESTS_FROM_ALL=OFF" "-DEXCLUDE_TESTS_FROM_ALL=OFF"

4
pkgs/top-level/all-packages.nix
View File

@ -35322,6 +35322,10 @@ with pkgs;
plasmoidSupport = false; plasmoidSupport = false;
systemdSupport = true; systemdSupport = true;
}; };
syncthingtray-qt6 = kdePackages.callPackage ../applications/misc/syncthingtray {
# renamed in KF5 -> KF6
plasma-framework = kdePackages.libplasma;
};
synergy = libsForQt5.callPackage ../applications/misc/synergy { synergy = libsForQt5.callPackage ../applications/misc/synergy {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;