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

libsoup's vala: 0.23 -> 0.26

Browse Source 
Close #17904.
This commit is contained in:
Ram Kromberg 2016-08-22 02:26:00 +03:00 committed by Vladimír Čunát
parent 1ba32c5403
commit 3bfb354145
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/libsoup/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig { stdenv, fetchurl, glib, libxml2, pkgconfig
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
, valaSupport ? true, vala_0_23 , valaSupport ? true, vala_0_32
, libintlOrEmpty , libintlOrEmpty
, intltool, python }: , intltool, python }:
let let
@ -25,7 +25,7 @@ stdenv.mkDerivation {
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
++ stdenv.lib.optionals valaSupport [ vala_0_23 ]; ++ stdenv.lib.optionals valaSupport [ vala_0_32 ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
@ -33,8 +33,7 @@ stdenv.mkDerivation {
# glib_networking is a runtime dependency, not a compile-time dependency # glib_networking is a runtime dependency, not a compile-time dependency
configureFlags = "--disable-tls-check" configureFlags = "--disable-tls-check"
+ stdenv.lib.optionalString (!valaSupport) " --enable-vala=no" + " --enable-vala=${if valaSupport then "yes" else "no"}"
+ stdenv.lib.optionalString (valaSupport) " --enable-vala=yes"
+ stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";