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

gnome3: use the same version of Vala

Browse Source
This commit is contained in:
Jan Tojnar 2017-10-10 22:24:04 +02:00
parent 3f610ddd81
commit 5a3b7ef2e7
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
9 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/apps/seahorse/default.nix
View File

@ -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 = ''

4
pkgs/desktops/gnome-3/core/dconf-editor/default.nix
View File

@ -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 ];

4
pkgs/desktops/gnome-3/core/folks/default.nix
View File

@ -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";

4
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
View File

@ -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.

4
pkgs/desktops/gnome-3/misc/gitg/default.nix
View File

@ -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 ];

4
pkgs/desktops/gnome-3/misc/pomodoro/default.nix
View File

@ -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

2
pkgs/development/compilers/vala/default.nix
View File

@ -65,5 +65,5 @@ in rec {
extraBuildInputs = [ graphviz ];
};
vala = vala_0_34;
vala = vala_0_38;
}

4
pkgs/development/libraries/libsecret/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc
, libgcrypt, gobjectIntrospection, vala_0_32 }:
, libgcrypt, gobjectIntrospection, vala_0_38 }:
let
version = "0.18.5";
in
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib ];
nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ];
buildInputs = [ libgcrypt gobjectIntrospection vala_0_32 ];
buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ];
# optional: build docs with gtk-doc? (probably needs a flag as well)
meta = {

4
pkgs/development/libraries/libsoup/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig
, gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection
, valaSupport ? true, vala_0_32
, valaSupport ? true, vala_0_38
, libintlOrEmpty
, intltool, python }:
let
@ -25,7 +25,7 @@ stdenv.mkDerivation {
outputs = [ "out" "dev" ];
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
++ stdenv.lib.optionals valaSupport [ vala_0_32 ];
++ stdenv.lib.optionals valaSupport [ vala_0_38 ];
nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ];