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

libsoup: 2.62.2 → 2.64.2

Browse Source
This commit is contained in:
Jan Tojnar 2018-09-05 00:51:03 +00:00
parent 6182a3fe4d
commit f78203de37
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr gtk3 webkitgtk librsvg libnotify sqlite gsettings-desktop-schemas pcre gnome3.gcr
libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core libxcb libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core
(libsoup.override {gnomeSupport = true; valaSupport = true;}) (libsoup.override {gnomeSupport = true;})
] ++ stdenv.lib.optionals zeitgeistSupport [ ] ++ stdenv.lib.optionals zeitgeistSupport [
zeitgeist zeitgeist
]; ];

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

@ -1,39 +1,35 @@
{ stdenv, fetchurl, glib, libxml2, pkgconfig, gnome3 { stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3
, gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection , gnomeSupport ? true, sqlite, glib-networking, gobjectIntrospection, vala
, valaSupport ? true, vala_0_40 , libpsl, python3 }:
, intltool, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "libsoup"; pname = "libsoup";
version = "2.62.2"; version = "2.64.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1dkrz1iwsswscayfmjxqv2q00b87snlq9nxdccn5vck0vbinylwy"; sha256 = "1il6lyrmfi0hfh3ysw8w1qzc1rdz0igkb7dv6d8g5mmilnac3pbm";
}; };
postPatch = '' postPatch = ''
patchShebangs libsoup/ patchShebangs libsoup/
'' + stdenv.lib.optionalString valaSupport ''
substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi"
''; '';
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
buildInputs = [ python3 sqlite ]; buildInputs = [ python3 sqlite libpsl ];
nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection ] nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection vala ];
++ stdenv.lib.optionals valaSupport [ vala_0_40 ];
propagatedBuildInputs = [ glib libxml2 ]; propagatedBuildInputs = [ glib libxml2 ];
# glib-networking is a runtime dependency, not a compile-time dependency mesonFlags = [
configureFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency
"--disable-tls-check" "-Dgssapi=false"
"--enable-vala=${if valaSupport then "yes" else "no"}" "-Dvapi=true"
"--with-gnome=${if gnomeSupport then "yes" else "no"}" "-Dgnome=${if gnomeSupport then "true" else "false"}"
]; ];
doCheck = false; # fails with "no: command not found" doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200)
passthru = { passthru = {
propagatedUserEnvPackages = [ glib-networking.out ]; propagatedUserEnvPackages = [ glib-networking.out ];