diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-18 18:57:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-18 18:57:56 +0200 |
| commit | 5448017c98b061a3aa964dc5651f17ef54861b4e (patch) | |
| tree | 012905af0b564485729ecf718cf05a5d4f9fc1b6 /pkgs | |
| parent | b9f2ef100ebd2fd6878e9a95d5c880ea990225af (diff) | |
| parent | 35614f6132854a1c5161c3fe28f26b398fe7ebc7 (diff) | |
Merge pull request #304880 from OPNA2608/fix/lomiri/network-indicator-work
lomiri.lomiri-network-indicator: Make it work, add it to Lomiri module
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix index 25cf5f7d528e4..fc552881f4696 100644 --- a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -47,11 +47,10 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - # Queried via pkg-config, would need to override a prefix variable - # Needs CMake 3.28 or higher to do as part of the call, https://github.com/NixOS/nixpkgs/pull/275284 + # Override original prefixes substituteInPlace data/CMakeLists.txt \ - --replace 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'set(DBUS_SESSION_BUS_SERVICES_DIR "''${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/services")' \ - --replace 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")' + --replace-fail 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=''${CMAKE_INSTALL_FULL_SYSCONFDIR})' \ + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' ''; strictDeps = true; |