gnome3.gnome-calculator: fix build

This commit is contained in:
Jan Tojnar 2018-03-14 01:40:07 +01:00
parent d345dd963e
commit de8d21a172
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 37 additions and 24 deletions

View File

@ -1,25 +1,28 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib
, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup , gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup
, glib, gnome-online-accounts, gsettings-desktop-schemas }: , glib, gnome-online-accounts, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { let
name = "gnome-calendar-${version}"; pname = "gnome-calendar";
version = "3.28.0"; version = "3.28.0";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gnome-calendar/${gnome3.versionBranch version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
sha256 = "1y5d6rgw7j5hy147i3ff73q9kkwj3nbyms7j705nfhri3s1ypqgs"; sha256 = "1y5d6rgw7j5hy147i3ff73q9kkwj3nbyms7j705nfhri3s1ypqgs";
}; };
passthru = { passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-calendar"; attrPath = "gnome3.gnome-calendar"; }; updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "gnome3.${pname}";
};
}; };
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk evolution-data-server libsoup glib gnome-online-accounts gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
gsettings-desktop-schemas gnome3.defaultIconTheme gsettings-desktop-schemas gnome3.defaultIconTheme
]; ];

View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, pkgconfig, libxml2 { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
, bash, gtk3, glib, wrapGAppsHook , gtk3, glib, gtksourceview3, wrapGAppsHook, gobjectIntrospection
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }: , gnome3, mpfr, gmp, libsoup, libmpc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-calculator-${version}"; name = "gnome-calculator-${version}";
@ -11,23 +11,33 @@ stdenv.mkDerivation rec {
sha256 = "1qnfvmf615v52c8h1f6zxbvpywi3512hnzyf9azvxb8a6q0rx1vn"; sha256 = "1qnfvmf615v52c8h1f6zxbvpywi3512hnzyf9azvxb8a6q0rx1vn";
}; };
nativeBuildInputs = [
meson ninja pkgconfig vala gettext itstool wrapGAppsHook
gobjectIntrospection # for finding vapi files
];
buildInputs = [
gtk3 glib libxml2 gtksourceview3 mpfr gmp
gnome3.defaultIconTheme
gnome3.gsettings-desktop-schemas libsoup libmpc
];
doCheck = true;
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
'';
passthru = { passthru = {
updateScript = gnome3.updateScript { packageName = "gnome-calculator"; attrPath = "gnome3.gnome-calculator"; }; updateScript = gnome3.updateScript {
packageName = "gnome-calculator";
attrPath = "gnome3.gnome-calculator";
};
}; };
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
propagatedUserEnvPkgs = [ gnome3.gnome-themes-standard ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ bash gtk3 glib intltool itstool
libxml2 gnome3.gtksourceview mpfr gmp
gdk_pixbuf gnome3.defaultIconTheme librsvg
gnome3.gsettings-desktop-schemas gnome3.dconf libsoup libmpc ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/action/show/Apps/Calculator; homepage = https://wiki.gnome.org/Apps/Calculator;
description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
license = licenses.gpl3; license = licenses.gpl3;