diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
commit | 6345089ca0af23a29387f48060a53dff0d0d30f5 (patch) | |
tree | aa11989838217951662f46c011205e11d525e4dc /pkgs/desktops/gnome-3/core/folks/default.nix | |
parent | 658951917437e7d587c8a206cc6497a7f1192891 (diff) | |
parent | e69a3248f7c8308b0d583941e8f1bb1a99a431a7 (diff) | |
download | nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.gz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.bz2 nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.lz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.xz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.zst nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.zip |
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice in the history, but let's merge this way.
Diffstat (limited to 'pkgs/desktops/gnome-3/core/folks/default.nix')
-rw-r--r-- | pkgs/desktops/gnome-3/core/folks/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 6fcaa67b7712..6be27021023a 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs +, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs , telepathy_glib, evolution_data_server, libsecret, db }: # TODO: enable more folks backends @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ]; + vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; |