Merge pull request #246098 from K900/syncthingtray-fix-plasmoid

syncthingtray: fix plasmoid
This commit is contained in:
Doron Behar
2023-07-30 07:04:29 +00:00
committed by GitHub
3 changed files with 7 additions and 1 deletions
@@ -70,7 +70,8 @@ mkDerivation rec {
cmakeFlags = [
"-DAUTOSTART_EXEC_PATH=${autostartExecPath}"
# See https://github.com/Martchus/syncthingtray/issues/42
"-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5"
"-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}"
"-DBUILD_SHARED_LIBS=ON"
] ++ lib.optionals (!plasmoidSupport) ["-DNO_PLASMOID=ON"]
++ lib.optionals (!kioPluginSupport) ["-DNO_FILE_ITEM_ACTION_PLUGIN=ON"]
++ lib.optionals systemdSupport ["-DSYSTEMD_SUPPORT=ON"]
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
buildInputs = lib.optionals stdenv.isDarwin [
iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4
];
cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"];
# Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files
preCheck = ''
checkFlagsArray+=(
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase cpp-utilities ];
nativeBuildInputs = [ cmake qttools ];
cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"];
dontWrapQtApps = true;
meta = with lib; {