summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/core
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2017-10-10 22:24:04 +0200
committerJan Tojnar <jtojnar@gmail.com>2017-11-26 03:10:50 +0100
commit5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d (patch)
tree9fa3527a60ae343cc8b5e356a0c594efa470bbef /pkgs/desktops/gnome-3/core
parent3f610ddd8157e3eb076445ec2a1e051deefae4ca (diff)
downloadnixpkgs-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar
nixpkgs-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.gz
nixpkgs-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.bz2
nixpkgs-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.lz
nixpkgs-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.xz
nixpkgs-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.tar.zst
nixpkgs-5a3b7ef2e7fa8ec748e1746403cb317b2d91b46d.zip
gnome3: use the same version of Vala
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
-rw-r--r--pkgs/desktops/gnome-3/core/dconf-editor/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/core/folks/default.nix4
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-terminal/default.nix4
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix
index cd401962c99..62ccb636034 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 6fcaa67b771..6be27021023 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 f45bc8264f1..b28c3a4c45d 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.