about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-10-05 07:24:14 -0400
committerGitHub <noreply@github.com>2017-10-05 07:24:14 -0400
commit34c2f08127bfbf930368a4658d86c35127fba28b (patch)
tree05f3e12332202612c4d18ff82a482bde710bcc51 /pkgs/development/compilers
parent623df97af5a1bf1f5dcbf9075b0ac8cbba036e25 (diff)
parenta8972678bf4d26f1b046335a127cb4311e0f50ae (diff)
downloadnixlib-34c2f08127bfbf930368a4658d86c35127fba28b.tar
nixlib-34c2f08127bfbf930368a4658d86c35127fba28b.tar.gz
nixlib-34c2f08127bfbf930368a4658d86c35127fba28b.tar.bz2
nixlib-34c2f08127bfbf930368a4658d86c35127fba28b.tar.lz
nixlib-34c2f08127bfbf930368a4658d86c35127fba28b.tar.xz
nixlib-34c2f08127bfbf930368a4658d86c35127fba28b.tar.zst
nixlib-34c2f08127bfbf930368a4658d86c35127fba28b.zip
Merge pull request #30043 from jtojnar/vala-0.38
vala: add 0.38.0
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/vala/default.nix18
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 42b81a21a671..baf48d7a532c 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -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;
 }