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

libsoup: 2.52.2 -> 2.54.1 & valaSupport (#16897)

Browse Source
This commit is contained in:
Ram Kromberg 2016-07-25 22:43:51 +03:00 committed by obadz
parent a6562f77d0
commit 6afb7b9a1a
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,33 +1,41 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig { stdenv, fetchurl, glib, libxml2, pkgconfig
, gnomeSupport ? false, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
, valaSupport ? true, vala
, libintlOrEmpty , libintlOrEmpty
, intltool, python }: , intltool, python }:
let let
majorVersion = "2.52"; majorVersion = "2.54";
version = "${majorVersion}.2"; version = "${majorVersion}.1";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "libsoup-${version}"; 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";
sha256 = "1p4k40y2gikr6m8p3hm0vswdzj2pj133dckipd2jk5bxbj5n4mfv"; sha256 = "0cyn5pq4xl1gb8413h2p4d5wrn558dc054zhwmk4swrl40ijrd27";
}; };
patchPhase = '' prePatch = ''
patchShebangs libsoup/ patchShebangs libsoup/
'' + stdenv.lib.optionalString valaSupport
''
substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
''; '';
outputs = [ "dev" "out" ]; outputs = [ "dev" "out" ];
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
++ stdenv.lib.optionals valaSupport [ vala ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
passthru.propagatedUserEnvPackages = [ glib_networking.out ]; passthru.propagatedUserEnvPackages = [ glib_networking.out ];
# 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 --enable-vala=no" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; configureFlags = "--disable-tls-check"
+ stdenv.lib.optionalString (!valaSupport) " --enable-vala=no"
+ stdenv.lib.optionalString (valaSupport) " --enable-vala=yes"
+ stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";