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

gnome3.evolution-data-server: Fix gsettings-desktop-schemas path

Browse Source
This commit is contained in:
Jan Tojnar 2019-08-12 16:45:28 +02:00
parent b18215bd6f
commit 80cb87971e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
, intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr
, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre
, vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib
, glib, gtk3, gnome-online-accounts, libgweather, libgdata }: , glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "evolution-data-server-${version}"; name = "evolution-data-server-${version}";
@ -20,9 +20,14 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit tzdata; inherit tzdata;
}) })
./hardcode-gsettings.patch
]; ];
prePatch = ''
substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas \
--subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas"
patches="$patches $PWD/hardcode-gsettings.patch"
'';
nativeBuildInputs = [ nativeBuildInputs = [
cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala
]; ];
@ -43,11 +48,6 @@ stdenv.mkDerivation rec {
"-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include"
]; ];
postPatch = ''
substituteInPlace src/libedataserver/e-source-registry.c --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = "evolution-data-server"; packageName = "evolution-data-server";

2
pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch
View File

@ -377,7 +377,7 @@ index 883379a60..989353494 100644
+ { + {
+ GSettingsSchemaSource *schema_source; + GSettingsSchemaSource *schema_source;
+ GSettingsSchema *schema; + GSettingsSchema *schema;
+ schema_source = g_settings_schema_source_new_from_directory("@ESD_GSETTINGS_PATH@", + schema_source = g_settings_schema_source_new_from_directory("@GDS_GSETTINGS_PATH@",
+ g_settings_schema_source_get_default(), + g_settings_schema_source_get_default(),
+ TRUE, + TRUE,
+ NULL); + NULL);