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

gnome3.geary: clean up

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-22 20:36:09 +01:00
parent 087ca0ca24
commit efd53598f8
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/desktops/gnome-3/misc/geary/default.nix
View File

@ -5,18 +5,17 @@
, gnome3, librsvg, gnome-doc-utils, webkitgtk }: , gnome3, librsvg, gnome-doc-utils, webkitgtk }:
let let
majorVersion = "0.12"; pname = "geary";
version = "0.12.1";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "geary-${majorVersion}.1"; name = "${pname}-${version}";
src = fetchurl { 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"; sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6";
}; };
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];
buildInputs = [ buildInputs = [
gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite 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" "-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes"
]; ];
preConfigure = '' # TODO: This is bad, upstream should fix their code.
substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${webkitgtk.dev}/share/gir-1.0";
'';
preFixup = '' preFixup = ''
# Add geary to path for geary-attach # Add geary to path for geary-attach
gappsWrapperArgs+=(--prefix PATH : "$out/bin") gappsWrapperArgs+=(--prefix PATH : "$out/bin")
''; '';
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "gnome3.${pname}";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Geary; homepage = https://wiki.gnome.org/Apps/Geary;
description = "Mail client for GNOME 3"; description = "Mail client for GNOME 3";