libsoup: enable introspection (gnome3 stuff needs it)

Also some minor refactoring of the expression.
This commit is contained in:
Vladimír Čunát 2014-02-01 10:12:36 +01:00
parent 449cfcfa91
commit ddf5841d74

View File

@ -1,12 +1,13 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig { stdenv, fetchurl, glib, libxml2, pkgconfig
, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
, libintlOrEmpty , libintlOrEmpty
, intltool, python }: , intltool, python }:
let
stdenv.mkDerivation rec {
name = "libsoup-${version}";
majorVersion = "2.45"; majorVersion = "2.45";
version = "${majorVersion}.3"; version = "${majorVersion}.3";
in
stdenv.mkDerivation {
name = "libsoup-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
@ -15,11 +16,11 @@ stdenv.mkDerivation rec {
patchPhase = '' patchPhase = ''
patchShebangs libsoup/ patchShebangs libsoup/
''; '';
buildInputs = libintlOrEmpty ++ [ intltool python ]; buildInputs = libintlOrEmpty ++ [ intltool python ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 ] propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
passthru.propagatedUserEnvPackages = [ glib_networking ]; passthru.propagatedUserEnvPackages = [ glib_networking ];