1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

Merge pull request #30043 from jtojnar/vala-0.38

vala: add 0.38.0
This commit is contained in:
Graham Christensen 2017-10-05 07:24:14 -04:00 committed by GitHub
commit 34c2f08127
2 changed files with 14 additions and 5 deletions

View file

@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt
, glib, libiconv, libintlOrEmpty
{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz
, glib, libiconv, libintlOrEmpty, libtool, expat
}:
let
generic = { major, minor, sha256 }:
generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }:
stdenv.mkDerivation rec {
name = "vala-${major}.${minor}";
@ -12,9 +12,9 @@ let
inherit sha256;
};
nativeBuildInputs = [ pkgconfig flex bison libxslt ];
nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs;
buildInputs = [ glib libiconv ] ++ libintlOrEmpty;
buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs;
meta = with stdenv.lib; {
description = "Compiler for GObject type system";
@ -57,5 +57,13 @@ in rec {
sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m";
};
vala_0_38 = generic {
major = "0.38";
minor = "1";
sha256 = "112hl3lkcyakrk8c3qgw12gzn3nxjkvx7bn0jhl5f2m57d7k8d8h";
extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ];
extraBuildInputs = [ graphviz ];
};
vala = vala_0_34;
}

View file

@ -6306,6 +6306,7 @@ with pkgs;
vala_0_28
vala_0_32
vala_0_34
vala_0_38
vala;
valadoc = callPackage ../development/tools/valadoc { };