From 4715cfe59fc4e8109b670ed6b0dcecae85a1dc77 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Wed, 8 Aug 2018 18:28:43 +0000 Subject: [PATCH] vala: make tests run, but disable --- pkgs/development/compilers/vala/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index f3dc24870272..510688ef4164 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz +{ stdenv, lib, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, automake, graphviz , glib, libiconv, libintl, libtool, expat }: @@ -7,13 +7,18 @@ let let atLeast = lib.versionAtLeast "${major}.${minor}"; in stdenv.mkDerivation rec { - name = "vala-${major}.${minor}"; + name = "vala-${version}"; + version = "${major}.${minor}"; src = fetchurl { url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; inherit sha256; }; + postPatch = '' + patchShebangs tests + ''; + outputs = [ "out" "devdoc" ]; nativeBuildInputs = [ @@ -26,6 +31,8 @@ let ] ++ lib.optional (atLeast "0.38") graphviz ++ extraBuildInputs; + doCheck = false; # fails, requires dbus daemon + meta = with stdenv.lib; { description = "Compiler for GObject type system"; homepage = https://wiki.gnome.org/Projects/Vala;