diff options
author | OPNA2608 <opna2608@protonmail.com> | 2024-04-17 21:31:18 +0200 |
---|---|---|
committer | OPNA2608 <opna2608@protonmail.com> | 2024-04-17 21:31:18 +0200 |
commit | e20e4d5ddd282ef21482902cc246ee68ddf1d281 (patch) | |
tree | 2d11e0362061c01892beb30a1e0c2dc15e5eba2c /pkgs/desktops/lomiri | |
parent | 9981e1b7ebbd9842ebdd24f6c83bbc8c08ed7f0e (diff) |
lomiri.lomiri-indicator-network: Update patching to newer CMake's possibilities
We can just define variables for pkg-config substitution now, no need to hardcode.
Diffstat (limited to 'pkgs/desktops/lomiri')
-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; |