diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-15 00:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-15 00:01:36 +0000 |
| commit | 2e421aaac4f9253cc79c4e1de0dee4281cc3e626 (patch) | |
| tree | 5b5e9b2bface81b73f503e17592866623184d0e3 /pkgs/desktops/gnome | |
| parent | d5e672b839267bf9243962dd3e25b00a8e0354bc (diff) | |
| parent | b65da092044b172f229bc611eabcbe212a1018c1 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/gnome')
| -rw-r--r-- | pkgs/desktops/gnome/core/evolution-data-server/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-contacts/default.nix | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 048fe600797b8..11308bfcf5e92 100644 --- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -38,7 +38,15 @@ stdenv.mkDerivation rec { libcanberra-gtk3 pcre libphonenumber boost protobuf ]; - propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ]; + propagatedBuildInputs = [ + db + libsecret + nss + nspr + libical + libgdata # needed for GObject inspection, https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs + libsoup + ]; cmakeFlags = [ "-DENABLE_UOA=OFF" diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 919bb5206cff5..1c16c3dd35ea8 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { evolution-data-server gsettings-desktop-schemas folks - libgdata # required by some dependency transitively gnome-desktop libhandy libxml2 |