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

Merge pull request #30228 from jtojnar/geary 

gnome3.geary: 0.11.3 → 0.12.0
This commit is contained in:
Graham Christensen 2017-10-13 09:04:49 -04:00 committed by GitHub
parent 6a404bba71 ef9b59c26f
commit 2a4f47dd1a
3 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/gnome-3/core/libgee/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }: { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
let let
ver_maj = "0.18"; ver_maj = "0.20";
ver_min = "0"; ver_min = "0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -8,15 +8,15 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
sha256 = "16a34js81w9m2bw4qd8csm4pcgr3zq5z87867j4b8wfh6zwrxnaa"; sha256 = "1fy24dr8imrjlmsqj1syn0gi139gba6hwk3j5vd6sr3pxniqnc11";
}; };
doCheck = true; doCheck = true;
patches = [ ./fix_introspection_paths.patch ]; patches = [ ./fix_introspection_paths.patch ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig autoconf vala pkgconfig gobjectIntrospection ];
buildInputs = [ autoconf vala_0_32 glib gobjectIntrospection ]; buildInputs = [ glib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";

5
pkgs/desktops/gnome-3/default.nix
View File

@ -366,10 +366,7 @@ let
california = callPackage ./misc/california { }; california = callPackage ./misc/california { };
geary = callPackage ./misc/geary { geary = callPackage ./misc/geary { };
# https://bugzilla.gnome.org/show_bug.cgi?id=728002
webkitgtk = pkgs.webkitgtk24x-gtk3;
};
gfbgraph = callPackage ./misc/gfbgraph { }; gfbgraph = callPackage ./misc/gfbgraph { };

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

@ -1,41 +1,34 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32 { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant
, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils , wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils
, libnotify, libcanberra_gtk3, libsecret, gmime , libnotify, libcanberra_gtk3, libsecret, gmime
, libpthreadstubs, sqlite , libpthreadstubs, sqlite
, gnome3, librsvg, gnome_doc_utils, webkitgtk }: , gnome3, librsvg, gnome_doc_utils, webkitgtk }:
let let
majorVersion = "0.11"; majorVersion = "0.12";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "geary-${majorVersion}.3"; name = "geary-${majorVersion}.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
sha256 = "1r42ijxafach5lv8ibs6y0l5k4nacjg427dnma8fj00xr1sri7j1"; sha256 = "0ii4qaqfqx90kvqwg0g9jahygkir4mb03ja55fa55yyx6cq0kwff";
}; };
propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ];
buildInputs = [ intltool gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite
vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite
libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
gdk_pixbuf librsvg gnome3.defaultIconTheme ]; gdk_pixbuf librsvg gnome3.defaultIconTheme ];
preConfigure = '' preConfigure = ''
substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0'
'';
postInstall = ''
mkdir -p $out/share/gsettings-schemas/${name}/
mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
''; '';
preFixup = '' preFixup = ''
wrapProgram "$out/bin/geary" \ # Add geary to path for geary-attach
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ gappsWrapperArgs+=(--prefix PATH : "$out/bin")
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;