diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-03-01 11:40:12 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-03-01 11:40:12 +0100 |
| commit | bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86 (patch) | |
| tree | 8eb035cbab19794f6415cc460fac7226f7a58afc /nixpkgs/pkgs/applications/misc/syncthingtray/default.nix | |
| parent | 66f707d69f1e423db5a35c2fe43b32781125a9af (diff) | |
| parent | 09c1497ce5d4ed4a0edfdd44450d3048074cb300 (diff) | |
| download | nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.gz nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.bz2 nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.lz nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.xz nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.tar.zst nixlib-bf6d657e5dbcb5e39fda280ef7e86b2a7794ca86.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/syncthingtray/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/misc/syncthingtray/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index 35632008f716..0badd7997603 100644 --- a/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/nixpkgs/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" |