From 90c8630a9a361e712172eabf7a8c3c4786286831 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 29 Jul 2023 23:30:04 +0300 Subject: [PATCH 1/3] cpp-utilities: build as a shared library This is required to get some header-only definitions set up so that applications using them export symbols properly. --- pkgs/development/libraries/cpp-utilities/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 45a87690e197..c3731c0e7a75 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -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+=( From 8767f7a362169ee96715b6953c6a78623d682636 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 29 Jul 2023 23:30:04 +0300 Subject: [PATCH 2/3] qtutilities: build as a shared library --- pkgs/development/libraries/qtutilities/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 9b866a26e698..93ecaa698f7a 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; + cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + dontWrapQtApps = true; meta = with lib; { From a8e308bff1b34c00808eb1e8b0a194c5ade2cd0d Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 29 Jul 2023 23:30:04 +0300 Subject: [PATCH 3/3] syncthingtray: build as a shared library, small cleanup This makes the plasmoid actually work. --- pkgs/applications/misc/syncthingtray/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 96e77baf3025..65c80cc81f1c 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -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"]