Unverified Commit d2c6595e authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

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

syncthingtray: fix plasmoid
parents bc2a487a a8e308bf

pkgs/applications/misc/syncthingtray/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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"]

pkgs/development/libraries/cpp-utilities/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -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+=(

pkgs/development/libraries/qtutilities/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec { 
  buildInputs = [ qtbase cpp-utilities ];

  nativeBuildInputs = [ cmake qttools ];



  cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"];



  dontWrapQtApps = true;



  meta = with lib; {