public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evolution-data-server: fix SSL support on non-GNOME platforms

Browse Source
This commit is contained in:
Jan Tojnar 2018-05-03 13:56:23 +02:00
parent c94a1e6158
commit 4feaecc23d
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf, gobjectIntrospection { fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection
, intltool, libsoup, libxml2, libsecret, icu, sqlite , intltool, libsoup, libxml2, libsecret, icu, sqlite
, p11-kit, db, nspr, nss, libical, gperf, makeWrapper , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking
, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }: , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake ninja pkgconfig intltool python3 gperf makeWrapper gobjectIntrospection vala cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection vala
]; ];
buildInputs = with gnome3; [ buildInputs = with gnome3; [
glib libsoup libxml2 gtk gnome-online-accounts glib libsoup libxml2 gtk gnome-online-accounts
gcr p11-kit libgweather libgdata libaccounts-glib json-glib gcr p11-kit libgweather libgdata libaccounts-glib json-glib
icu sqlite kerberos openldap webkitgtk icu sqlite kerberos openldap webkitgtk glib-networking
]; ];
propagatedBuildInputs = [ libsecret nss nspr libical db ]; propagatedBuildInputs = [ libsecret nss nspr libical db ];
@ -36,14 +36,6 @@ stdenv.mkDerivation rec {
cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags" cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags"
''; '';
preFixup = ''
for f in $(find $out/libexec/ -type f -executable); do
wrapProgram "$f" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
done
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = "evolution-data-server"; packageName = "evolution-data-server";