diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2023-12-31 15:45:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 15:45:28 +0100 |
| commit | ed02ccffac9aefbc9f2c0db31c192742ba318b60 (patch) | |
| tree | b1eda601222211493ed69b0144b66b1a0882871f /pkgs/desktops | |
| parent | a5cbc50912518d6cb043f705b1c55b586b3de277 (diff) | |
| parent | 0c90ac55d14af608b00091f35fa22e62af6fb4fe (diff) | |
Merge pull request #276248 from OPNA2608/fix/hfd-service-accountsservice-interfaces
lomiri.hfd-service: Fix accountsservice interface linking
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/lomiri/services/hfd-service/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/desktops/lomiri/services/hfd-service/default.nix b/pkgs/desktops/lomiri/services/hfd-service/default.nix index cffedb0af6235..e9ae4a0fe2dba 100644 --- a/pkgs/desktops/lomiri/services/hfd-service/default.nix +++ b/pkgs/desktops/lomiri/services/hfd-service/default.nix @@ -31,10 +31,11 @@ stdenv.mkDerivation (finalAttrs: { # Queries pkg-config via pkg_get_variable, can't override prefix substituteInPlace init/CMakeLists.txt \ - --replace "\''${SYSTEMD_SYSTEM_DIR}" "$out/lib/systemd/system" + --replace 'pkg_get_variable(SYSTEMD_SYSTEM_DIR systemd systemdsystemunitdir)' 'set(SYSTEMD_SYSTEM_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/system)' substituteInPlace CMakeLists.txt \ - --replace 'pkg_get_variable(AS_INTERFACES_DIR accountsservice interfacesdir)' 'set(AS_INTERFACES_DIR "''${CMAKE_INSTALL_DATADIR}/accountsservice/interfaces")' \ - --replace 'DESTINATION ''${DBUS_INTERFACES_DIR}' 'DESTINATION ${placeholder "out"}/''${DBUS_INTERFACES_DIR}' + --replace 'pkg_get_variable(AS_INTERFACES_DIR accountsservice interfacesdir)' 'set(AS_INTERFACES_DIR "''${CMAKE_INSTALL_FULL_DATADIR}/accountsservice/interfaces")' \ + --replace '../../dbus-1/interfaces' "\''${CMAKE_INSTALL_PREFIX}/\''${DBUS_INTERFACES_DIR}" \ + --replace 'DESTINATION ''${DBUS_INTERFACES_DIR}' 'DESTINATION ''${CMAKE_INSTALL_PREFIX}/''${DBUS_INTERFACES_DIR}' substituteInPlace src/CMakeLists.txt \ --replace "\''${DBUS_INTERFACES_DIR}/org.freedesktop.Accounts.xml" '${accountsservice}/share/dbus-1/interfaces/org.freedesktop.Accounts.xml' ''; |