diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/development/libraries/libsoup/default.nix | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libsoup/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libsoup/default.nix | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/nixpkgs/pkgs/development/libraries/libsoup/default.nix index a497661725b1..88c6a359ba8d 100644 --- a/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3 +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkgconfig, gnome3, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala -, libpsl, python3, brotli }: +, libpsl, python3, brotli +}: stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.70.0"; + version = "2.72.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l"; + sha256 = "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"; }; postPatch = '' @@ -17,16 +18,28 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ python3 sqlite libpsl brotli ]; + buildInputs = [ + python3 + sqlite + libpsl + glib.out + brotli + ] ++ lib.optionals stdenv.isLinux [ + libsysprof-capture + ]; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ]; propagatedBuildInputs = [ glib libxml2 ]; + NIX_CFLAGS_COMPILE = [ "-lpthread" ]; + mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" "-Dvapi=enabled" - "-Dgnome=${if gnomeSupport then "true" else "false"}" + "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsysprof=disabled" ]; doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) @@ -41,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTP client/server library for GNOME"; homepage = "https://wiki.gnome.org/Projects/libsoup"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.lgpl2Plus; inherit (glib.meta) maintainers platforms; }; } |