diff options
| author | Tom Fitzhenry <tom@tom-fitzhenry.me.uk> | 2021-12-10 22:51:54 +1100 |
|---|---|---|
| committer | Tom Fitzhenry <tom@tom-fitzhenry.me.uk> | 2022-01-15 06:05:40 +1100 |
| commit | 47a8b15664f45dc66c166be35e0615163b6199d3 (patch) | |
| tree | 6295967640171af3bcc7514d2407cb3d21553646 /pkgs/desktops/gnome | |
| parent | bc9fd41f23da8edbcfc1c39bfb38198ceac5bd5b (diff) | |
| download | nixpkgs-47a8b15664f45dc66c166be35e0615163b6199d3.tar nixpkgs-47a8b15664f45dc66c166be35e0615163b6199d3.tar.gz nixpkgs-47a8b15664f45dc66c166be35e0615163b6199d3.tar.bz2 nixpkgs-47a8b15664f45dc66c166be35e0615163b6199d3.tar.lz nixpkgs-47a8b15664f45dc66c166be35e0615163b6199d3.tar.xz nixpkgs-47a8b15664f45dc66c166be35e0615163b6199d3.tar.zst nixpkgs-47a8b15664f45dc66c166be35e0615163b6199d3.zip | |
evolution-data-server: propagate libgdata
Motivation: Stop programs from having to declare transitive dependencies (fixed in this commit). Per https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs, evolution-data-server requires libgdata for gobject introspection. See also https://github.com/NixOS/nixpkgs/commit/025960d2296456b8a4cc3b2bcd5a6c624c68a54b, which did a similar thing for libsoup.
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 048fe600797..11308bfcf5e 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 919bb5206cf..1c16c3dd35e 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 |