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

libsoup: fix build & clean up

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-13 22:46:46 +01:00
parent 04a7df366c
commit af766c764e
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 13 additions and 21 deletions

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

@ -1,8 +1,8 @@
{ stdenv, fetchurl, fetchpatch, glib, libxml2, pkgconfig, gnome3 { stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3
, gnomeSupport ? true, libgnome-keyring3, sqlite, glib-networking, gobjectIntrospection , gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection
, valaSupport ? true, vala_0_38 , valaSupport ? true, vala_0_40
, libintlOrEmpty , libintlOrEmpty
, intltool, python }: , intltool, python3 }:
let let
pname = "libsoup"; pname = "libsoup";
version = "2.62.0"; version = "2.62.0";
@ -22,27 +22,19 @@ stdenv.mkDerivation rec {
substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
''; '';
patches = [
# remove for >= 2.60.3
(fetchpatch {
name = "buffer-overflow.patch"; # https://bugzilla.gnome.org/show_bug.cgi?id=788037
url = "https://git.gnome.org/browse/libsoup/patch/?id=b79689833ba";
sha256 = "1azbk540mbm4c6ip54ixbg9d6w7nkls9y81fzm3csq9a5786r3d3";
})
];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] buildInputs = libintlOrEmpty ++ [ python3 sqlite ];
++ stdenv.lib.optionals valaSupport [ vala_0_38 ]; nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ]
nativeBuildInputs = [ pkgconfig ]; ++ stdenv.lib.optionals valaSupport [ vala_0_40 ];
propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] propagatedBuildInputs = [ glib libxml2 ];
++ stdenv.lib.optionals gnomeSupport [ libgnome-keyring3 ];
# 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 = [
+ " --enable-vala=${if valaSupport then "yes" else "no"}" "--disable-tls-check"
+ stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; "--enable-vala=${if valaSupport then "yes" else "no"}"
"--with-gnome=${if gnomeSupport then "yes" else "no"}"
];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";