diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-10-10 22:24:04 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2017-11-26 03:10:50 +0100 |
commit | 5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d (patch) | |
tree | 9fa3527a60ae343cc8b5e356a0c594efa470bbef /pkgs/desktops/gnome-3 | |
parent | 3f610ddd8157e3eb076445ec2a1e051deefae4ca (diff) | |
download | nixlib-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar nixlib-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.gz nixlib-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.bz2 nixlib-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.lz nixlib-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.xz nixlib-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.zst nixlib-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.zip |
gnome3: use the same version of Vala
Diffstat (limited to 'pkgs/desktops/gnome-3')
6 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 03dbdb1842a4..3bc69f67a4f8 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, intltool, fetchurl, vala_0_32 +{ stdenv, intltool, fetchurl, vala , pkgconfig, gtk3, glib , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, librsvg, gdk_pixbuf, gpgme @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib intltool itstool gnome3.gcr gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala_0_32 + libsecret avahi libsoup p11_kit vala openssh ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index cd401962c99c..62ccb6360341 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 +{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme + buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix index 6fcaa67b7712..6be27021023a 100644 --- a/pkgs/desktops/gnome-3/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/core/folks/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs +, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs , telepathy_glib, evolution_data_server, libsecret, db }: # TODO: enable more folks backends @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; # dbus_daemon needed for tests buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ]; + vala libsecret libxml2 libsoup nspr nss intltool db ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = "--disable-fatal-warnings"; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index f45bc8264f11..b28c3a4c45d8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3 -, gnome_doc_utils, intltool, which, libuuid, vala_0_32 +, gnome_doc_utils, intltool, which, libuuid, vala , desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { gnome3.dconf itstool gnome3.nautilus ]; nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 - vala_0_32 desktop_file_utils wrapGAppsHook ]; + vala desktop_file_utils wrapGAppsHook ]; # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index b3646abd6dda..34c54be40c47 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib +{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib , json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection , gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret , dconf}: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ shared_mime_info gnome3.gnome_themes_standard ]; - buildInputs = [ vala_0_32 libgit2 gtk3 glib json_glib webkitgtk libgee libpeas + buildInputs = [ vala libgit2 gtk3 glib json_glib webkitgtk libgee libpeas libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 63f59357db5e..546c2ac46a23 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, - dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3, + dbus_glib, libcanberra_gtk2, gst_all_1, vala, gnome3, gtk3, glib, gobjectIntrospection, libpeas }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobjectIntrospection libpeas - dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer + dbus_glib libcanberra_gtk2 vala gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_common gnome3.gnome_shell gtk3 |