diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-03-22 20:36:09 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-03-23 13:18:40 +0100 |
| commit | efd53598f8d203271179ee1dfda836e48868426b (patch) | |
| tree | 62449c67beb74ef7999d3bd05c772f6cb2049f5e /pkgs | |
| parent | 087ca0ca24b633851ebf4fa6b6aa520fc2381d77 (diff) | |
| download | nixlib-efd53598f8d203271179ee1dfda836e48868426b.tar nixlib-efd53598f8d203271179ee1dfda836e48868426b.tar.gz nixlib-efd53598f8d203271179ee1dfda836e48868426b.tar.bz2 nixlib-efd53598f8d203271179ee1dfda836e48868426b.tar.lz nixlib-efd53598f8d203271179ee1dfda836e48868426b.tar.xz nixlib-efd53598f8d203271179ee1dfda836e48868426b.tar.zst nixlib-efd53598f8d203271179ee1dfda836e48868426b.zip | |
gnome3.geary: clean up
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/misc/geary/default.nix | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 5a95802b81a7..1994b587fbd3 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -5,18 +5,17 @@ , gnome3, librsvg, gnome-doc-utils, webkitgtk }: let - majorVersion = "0.12"; + pname = "geary"; + version = "0.12.1"; in stdenv.mkDerivation rec { - name = "geary-${majorVersion}.1"; + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6"; }; - propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; - nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite @@ -28,15 +27,21 @@ stdenv.mkDerivation rec { "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes" ]; - preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' - ''; + # TODO: This is bad, upstream should fix their code. + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0"; preFixup = '' # Add geary to path for geary-attach gappsWrapperArgs+=(--prefix PATH : "$out/bin") ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Geary; description = "Mail client for GNOME 3"; |