summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Fitzhenry <tom@tom-fitzhenry.me.uk>2021-12-10 22:51:54 +1100
committerTom Fitzhenry <tom@tom-fitzhenry.me.uk>2022-01-15 06:05:40 +1100
commit47a8b15664f45dc66c166be35e0615163b6199d3 (patch)
tree6295967640171af3bcc7514d2407cb3d21553646
parentbc9fd41f23da8edbcfc1c39bfb38198ceac5bd5b (diff)
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.
-rw-r--r--pkgs/applications/networking/calls/default.nix1
-rw-r--r--pkgs/applications/office/elementary-planner/default.nix1
-rw-r--r--pkgs/desktops/gnome/core/evolution-data-server/default.nix10
-rw-r--r--pkgs/desktops/gnome/core/gnome-contacts/default.nix1
-rw-r--r--pkgs/desktops/pantheon/apps/elementary-calendar/default.nix1
-rw-r--r--pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix1
6 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index 2eb0f63bc345..8282713aa00a 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -73,7 +73,6 @@ stdenv.mkDerivation rec {
callaudiod
gtk3
libpeas
- libgdata # required by some dependency transitively
sofia_sip
];
diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix
index c0cdfd75d9be..d07133e9065e 100644
--- a/pkgs/applications/office/elementary-planner/default.nix
+++ b/pkgs/applications/office/elementary-planner/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
pantheon.granite
sqlite
webkitgtk
- libgdata # required by some dependency transitively
libhandy
curl
];
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
index 048fe600797b..11308bfcf5e9 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 919bb5206cff..1c16c3dd35ea 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
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index 019e2cf5a242..c7c5becd7032 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -64,7 +64,6 @@ stdenv.mkDerivation rec {
libhandy
libical
libnotify
- libgdata # required by some dependency transitively
];
postPatch = ''
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 1164e0592bfb..3f7408d9dff3 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
libical
libsoup
wingpanel
- libgdata # required by some dependency transitively
];
postPatch = ''