diff options
| author | Ram Kromberg <ramkromberg@mail.com> | 2016-08-22 02:26:00 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-29 18:45:55 +0200 |
| commit | 3bfb354145e91aeb681697a954a858e9dce4ecd9 (patch) | |
| tree | 23876f33f3e1fe36833a251802bd7f8c15d58541 /pkgs/development/libraries/libsoup | |
| parent | 1ba32c54036cf6552d5f4aaf3d34ccaaa006dbe0 (diff) | |
libsoup's vala: 0.23 -> 0.26
Close #17904.
Diffstat (limited to 'pkgs/development/libraries/libsoup')
| -rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 05026a06c613..708d2e0e3db3 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection -, valaSupport ? true, vala_0_23 +, valaSupport ? true, vala_0_32 , libintlOrEmpty , intltool, python }: let @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputs = [ "dev" "out" ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] - ++ stdenv.lib.optionals valaSupport [ vala_0_23 ]; + ++ stdenv.lib.optionals valaSupport [ vala_0_32 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; @@ -33,8 +33,7 @@ stdenv.mkDerivation { # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check" - + stdenv.lib.optionalString (!valaSupport) " --enable-vala=no" - + stdenv.lib.optionalString (valaSupport) " --enable-vala=yes" + + " --enable-vala=${if valaSupport then "yes" else "no"}" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; |