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

gnome3.geary: fix build

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-15 13:26:29 +01:00
parent ac38e53c7a
commit a8bbecd004
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_40, enchant
, wrapGAppsHook, gdk_pixbuf, cmake, desktop-file-utils , wrapGAppsHook, gdk_pixbuf, cmake, ninja, desktop-file-utils
, libnotify, libcanberra-gtk3, libsecret, gmime , libnotify, libcanberra-gtk3, libsecret, gmime, isocodes
, libpthreadstubs, sqlite , gobjectIntrospection, libpthreadstubs, sqlite
, gnome3, librsvg, gnome-doc-utils, webkitgtk }: , gnome3, librsvg, gnome-doc-utils, webkitgtk }:
let let
@ -17,10 +17,16 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ]; propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop-file-utils gnome-doc-utils ]; 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 buildInputs = [
libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr gtk3 enchant webkitgtk libnotify libcanberra-gtk3 gnome3.libgee libsecret gmime sqlite
gdk_pixbuf librsvg gnome3.defaultIconTheme ]; libpthreadstubs gnome3.gsettings-desktop-schemas gnome3.gcr isocodes
gdk_pixbuf librsvg gnome3.defaultIconTheme
];
cmakeFlags = [
"-DISOCODES_DIRECTORY=${isocodes}/share/xml/iso-codes"
];
preConfigure = '' preConfigure = ''
substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0'
@ -31,8 +37,6 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(--prefix PATH : "$out/bin") gappsWrapperArgs+=(--prefix PATH : "$out/bin")
''; '';
enableParallelBuilding = true;
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";