diff options
Diffstat (limited to 'pkgs/applications/misc/syncthingtray/default.nix')
| -rw-r--r-- | pkgs/applications/misc/syncthingtray/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 35632008f716..0badd7997603 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -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" |