diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-08-12 16:45:28 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-08-12 18:32:12 +0200 |
| commit | 80cb87971e9ddc5c2fa6c49c94e4ffb8283b295e (patch) | |
| tree | 16e24dcb54da37f3f94a77c291ae533bcfd8f573 /pkgs/desktops | |
| parent | b18215bd6f74ec20e242a5cab9e2a19843d3e900 (diff) | |
| download | nixpkgs-80cb87971e9ddc5c2fa6c49c94e4ffb8283b295e.tar nixpkgs-80cb87971e9ddc5c2fa6c49c94e4ffb8283b295e.tar.gz nixpkgs-80cb87971e9ddc5c2fa6c49c94e4ffb8283b295e.tar.bz2 nixpkgs-80cb87971e9ddc5c2fa6c49c94e4ffb8283b295e.tar.lz nixpkgs-80cb87971e9ddc5c2fa6c49c94e4ffb8283b295e.tar.xz nixpkgs-80cb87971e9ddc5c2fa6c49c94e4ffb8283b295e.tar.zst nixpkgs-80cb87971e9ddc5c2fa6c49c94e4ffb8283b295e.zip | |
gnome3.evolution-data-server: Fix gsettings-desktop-schemas path
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch | 2 |
2 files changed, 8 insertions, 8 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 5c2eae883cf..078145e1231 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -2,7 +2,7 @@ , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre , 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 { name = "evolution-data-server-${version}"; @@ -20,9 +20,14 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; 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 = [ cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; @@ -43,11 +48,6 @@ stdenv.mkDerivation rec { "-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 = { updateScript = gnome3.updateScript { packageName = "evolution-data-server"; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch index adc0ba6746f..c499bac4552 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch @@ -377,7 +377,7 @@ index 883379a60..989353494 100644 + { + GSettingsSchemaSource *schema_source; + 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(), + TRUE, + NULL); |