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

ReRevert Merge x-updates into master

Browse Source 
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
This commit is contained in:
Vladimír Čunát
2013-05-29 23:24:20 +02:00
parent 971337a119
commit b770365574
135 changed files with 2718 additions and 1591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,24 @@
{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, libintlOrEmpty }:
{ stdenv, fetchurl, yacc, flex, pkgconfig, glib, dbus, dbus_tools, libiconvOrEmpty }:
stdenv.mkDerivation rec {
version = "0.17.2";
name = "vala-${version}";
p_name = "vala";
ver_maj = "0.19";
ver_min = "0";
src = fetchurl {
url = "mirror://gnome/sources/vala/0.17/${name}.tar.xz";
sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3";
url = "mirror://gnome/sources/${p_name}/${ver_maj}/${name}.tar.xz";
sha256 = "1vn524hcnaggz8zx49mvf7p4z1mscrlj2syg7jjhph8nak5wi0bp";
};
name = "${p_name}-${ver_maj}.${ver_min}";
postPatch = "patchShebangs .";
nativeBuildInputs = [ yacc flex pkgconfig ];
buildInputs = [ glib ] ++ libintlOrEmpty;
buildInputs = [ glib ] ++ libiconvOrEmpty
++ stdenv.lib.optional doCheck [ dbus dbus_tools ];
doCheck = false; # problems when launching dbus tests
meta = {
description = "Compiler for the GObject type system";