nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #276248 from OPNA2608/fix/hfd-service-accountsservice-interfaces

Browse Source 
lomiri.hfd-service: Fix accountsservice interface linking
This commit is contained in:
Guillaume Girol 2023-12-31 15:45:28 +01:00 committed by GitHub
commit ed02ccffac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/desktops/lomiri/services/hfd-service/default.nix
View File

@ -31,10 +31,11 @@ stdenv.mkDerivation (finalAttrs: {
# Queries pkg-config via pkg_get_variable, can't override prefix # Queries pkg-config via pkg_get_variable, can't override prefix
substituteInPlace init/CMakeLists.txt \ 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 \ substituteInPlace CMakeLists.txt \
--replace 'pkg_get_variable(AS_INTERFACES_DIR accountsservice interfacesdir)' 'set(AS_INTERFACES_DIR "''${CMAKE_INSTALL_DATADIR}/accountsservice/interfaces")' \ --replace 'pkg_get_variable(AS_INTERFACES_DIR accountsservice interfacesdir)' 'set(AS_INTERFACES_DIR "''${CMAKE_INSTALL_FULL_DATADIR}/accountsservice/interfaces")' \
--replace 'DESTINATION ''${DBUS_INTERFACES_DIR}' 'DESTINATION ${placeholder "out"}/''${DBUS_INTERFACES_DIR}' --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 \ substituteInPlace src/CMakeLists.txt \
--replace "\''${DBUS_INTERFACES_DIR}/org.freedesktop.Accounts.xml" '${accountsservice}/share/dbus-1/interfaces/org.freedesktop.Accounts.xml' --replace "\''${DBUS_INTERFACES_DIR}/org.freedesktop.Accounts.xml" '${accountsservice}/share/dbus-1/interfaces/org.freedesktop.Accounts.xml'
''; '';