mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 20:34:52 +03:00
libsoup: 2.52.2 -> 2.54.1 & valaSupport (#16897)
This commit is contained in:
parent
a6562f77d0
commit
6afb7b9a1a
@ -1,33 +1,41 @@
|
||||
{ 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
|
||||
, intltool, python }:
|
||||
let
|
||||
majorVersion = "2.52";
|
||||
version = "${majorVersion}.2";
|
||||
majorVersion = "2.54";
|
||||
version = "${majorVersion}.1";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "libsoup-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
|
||||
sha256 = "1p4k40y2gikr6m8p3hm0vswdzj2pj133dckipd2jk5bxbj5n4mfv";
|
||||
sha256 = "0cyn5pq4xl1gb8413h2p4d5wrn558dc054zhwmk4swrl40ijrd27";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
prePatch = ''
|
||||
patchShebangs libsoup/
|
||||
'' + stdenv.lib.optionalString valaSupport
|
||||
''
|
||||
substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
|
||||
'';
|
||||
|
||||
outputs = [ "dev" "out" ];
|
||||
|
||||
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ];
|
||||
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]
|
||||
++ stdenv.lib.optionals valaSupport [ vala ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
|
||||
++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
|
||||
passthru.propagatedUserEnvPackages = [ glib_networking.out ];
|
||||
|
||||
# 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";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user