diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-12-19 00:00:04 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2017-12-20 07:35:56 +0100 |
| commit | 6002d1785d8d8b2e80078797f72c433f666fc00f (patch) | |
| tree | 5586827b446569288c012fd89efe4caf120c291c | |
| parent | f5d7b05f1e5657addc526886dc6fa3a6918326be (diff) | |
| download | nixlib-6002d1785d8d8b2e80078797f72c433f666fc00f.tar nixlib-6002d1785d8d8b2e80078797f72c433f666fc00f.tar.gz nixlib-6002d1785d8d8b2e80078797f72c433f666fc00f.tar.bz2 nixlib-6002d1785d8d8b2e80078797f72c433f666fc00f.tar.lz nixlib-6002d1785d8d8b2e80078797f72c433f666fc00f.tar.xz nixlib-6002d1785d8d8b2e80078797f72c433f666fc00f.tar.zst nixlib-6002d1785d8d8b2e80078797f72c433f666fc00f.zip | |
gnome3.evolution_data_server: clean up
| -rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index ebe740a2167c..f6ee457dc63f 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf +{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf , intltool, libsoup, libxml2, libsecret, icu, sqlite , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true , vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }: @@ -6,21 +6,25 @@ stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - nativeBuildInputs = [ cmake pkgconfig intltool python gperf makeWrapper ]; - buildInputs = with gnome3; - [ glib libsoup libxml2 gtk gnome_online_accounts - (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata - icu sqlite gsettings_desktop_schemas kerberos openldap webkitgtk - libaccounts-glib json_glib ] - ++ stdenv.lib.optional valaSupport vala; + nativeBuildInputs = [ + cmake pkgconfig intltool python3 gperf makeWrapper + ] ++ stdenv.lib.optional valaSupport vala; + buildInputs = with gnome3; [ + glib libsoup libxml2 gtk gnome_online_accounts + gcr p11_kit libgweather libgdata libaccounts-glib json_glib + icu sqlite kerberos openldap webkitgtk + ]; propagatedBuildInputs = [ libsecret nss nspr libical db ]; # uoa irrelevant for now - cmakeFlags = [ "-DENABLE_UOA=OFF" ] - ++ stdenv.lib.optionals valaSupport [ - "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + cmakeFlags = [ + "-DENABLE_UOA=OFF" + ] ++ stdenv.lib.optionals valaSupport [ + "-DENABLE_VALA_BINDINGS=ON" + "-DENABLE_INTROSPECTION=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" + ]; enableParallelBuilding = true; @@ -33,8 +37,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - platforms = platforms.linux; + license = licenses.lgpl2; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } |