diff --git a/pkgs/development/libraries/libayatana-common/default.nix b/pkgs/development/libraries/libayatana-common/default.nix index 216e05f6709c..439cc45031f9 100644 --- a/pkgs/development/libraries/libayatana-common/default.nix +++ b/pkgs/development/libraries/libayatana-common/default.nix @@ -4,11 +4,11 @@ , gitUpdater , testers , cmake -, cmake-extras , glib , gobject-introspection , gtest , intltool +, lomiri , pkg-config , systemd , vala @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Queries via pkg_get_variable, can't override prefix substituteInPlace data/CMakeLists.txt \ - --replace 'DESTINATION "''${SYSTEMD_USER_UNIT_DIR}"' 'DESTINATION "${placeholder "out"}/lib/systemd/user"' + --replace 'pkg_get_variable(SYSTEMD_USER_UNIT_DIR systemd systemd_user_unit_dir)' 'set(SYSTEMD_USER_UNIT_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' ''; strictDeps = true; @@ -42,8 +42,9 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - cmake-extras + lomiri.cmake-extras glib + lomiri.lomiri-url-dispatcher systemd ]; @@ -53,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" - "-DENABLE_LOMIRI_FEATURES=OFF" + "-DENABLE_LOMIRI_FEATURES=ON" "-DGSETTINGS_LOCALINSTALL=ON" "-DGSETTINGS_COMPILE=ON" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cfe9c05e4f9..961f8c4d61cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22429,9 +22429,7 @@ with pkgs; libavif = callPackage ../development/libraries/libavif { }; - libayatana-common = callPackage ../development/libraries/libayatana-common { - inherit (lomiri) cmake-extras; - }; + libayatana-common = callPackage ../development/libraries/libayatana-common { }; libb2 = callPackage ../development/libraries/libb2 { };