From ddf5841d74a6037197d0f8aa24a2f3ef9b6de1ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 1 Feb 2014 10:12:36 +0100 Subject: [PATCH] libsoup: enable introspection (gnome3 stuff needs it) Also some minor refactoring of the expression. --- pkgs/development/libraries/libsoup/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 12124474566..049d6646ec8 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig -, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking +, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection , libintlOrEmpty , intltool, python }: - -stdenv.mkDerivation rec { - name = "libsoup-${version}"; +let majorVersion = "2.45"; version = "${majorVersion}.3"; +in +stdenv.mkDerivation { + name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { patchPhase = '' patchShebangs libsoup/ - ''; + ''; buildInputs = libintlOrEmpty ++ [ intltool python ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libxml2 ] + propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; passthru.propagatedUserEnvPackages = [ glib_networking ];