diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-09-24 13:15:50 +0200 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2017-09-24 12:15:50 +0100 |
commit | 69698ec11cc0619d84b14764fa9e708fe7e7223c (patch) | |
tree | 9d9f602554b497a3265caf5e2ef4821e12736686 /pkgs/desktops/gnome-3/core/evolution-data-server | |
parent | 23b19efdc9c8d64177cefcaa5b919db966bb8f5e (diff) | |
download | nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.gz nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.bz2 nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.lz nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.xz nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.tar.zst nixpkgs-69698ec11cc0619d84b14764fa9e708fe7e7223c.zip |
gnome3: only maintain single GNOME 3 package set (#29397)
* gnome3: only maintain single GNOME 3 package set GNOME 3 was split into 3.10 and 3.12 in #2694. Unfortunately, we barely have the resources to update a single version of GNOME. Maintaining multiple versions just does not make sense. Additionally, it makes viewing history using most Git tools bothersome. This commit renames `pkgs/desktops/gnome-3/3.24` to `pkgs/desktops/gnome-3`, removes the config variable for choosing packageset (`environment.gnome3.packageSet`), updates the hint in maintainer script, and removes the `gnome3_24` derivation from `all-packages.nix`. Closes: #29329 * maintainers/scripts/gnome: Use fixed GNOME 3 directory Since we now allow only a single GNOME 3 package set, specifying the working directory is not necessary. This commit sets the directory to `pkgs/desktops/gnome-3`.
Diffstat (limited to 'pkgs/desktops/gnome-3/core/evolution-data-server')
-rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 39 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/evolution-data-server/src.nix | 10 |
2 files changed, 49 insertions, 0 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 new file mode 100644 index 00000000000..9d51dc969d3 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -0,0 +1,39 @@ +{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf +, intltool, libsoup, libxml2, libsecret, icu, sqlite +, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, +vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }: + +stdenv.mkDerivation rec { + inherit (import ./src.nix fetchurl) name src; + + buildInputs = with gnome3; + [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts + (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper + icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk + libaccounts-glib ] + ++ stdenv.lib.optional valaSupport vala_0_32; + + propagatedBuildInputs = [ libsecret nss nspr libical db ]; + + # uoa irrelevant for now + cmakeFlags = [ "-DENABLE_UOA=OFF" "-DENABLE_GOA=OFF" ] + ++ stdenv.lib.optionals valaSupport [ + "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" + "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; + + enableParallelBuilding = true; + + 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 + ''; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; + +} diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix new file mode 100644 index 00000000000..655fffe0eb9 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "evolution-data-server-3.24.5"; + + src = fetchurl { + url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz; + sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1"; + }; +} |