From 7523091d9775887537a004dfeecc0f10b95980e0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 12 Apr 2024 13:20:37 +0200 Subject: [PATCH] lomiri.lomiri-download-manager: Fix lack of output fixup in pkg-config file, update pkg-config call with new CMake option --- .../services/lomiri-download-manager/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix index 5c2f02b596fb..6174bd9c54b0 100644 --- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix @@ -55,10 +55,16 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # pkg_get_variable doesn't let us substitute prefix pkg-config variable from systemd + # Substitute systemd's prefix in pkg-config call substituteInPlace CMakeLists.txt \ - --replace 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR "${placeholder "out"}/lib/systemd/user")' \ - --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + + # For our automatic pkg-config output patcher to work, prefix must be used here + substituteInPlace src/{common/public,downloads/client,downloads/common,uploads/common}/*.pc.in \ + --replace-fail 'libdir=''${exec_prefix}' 'libdir=''${prefix}' + substituteInPlace src/downloads/client/lomiri-download-manager-client.pc.in \ + --replace-fail 'includedir=''${exec_prefix}' 'includedir=''${prefix}' ''; strictDeps = true;