diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
commit | 2aa6f262cbb2052d604874223549ca44fd448a67 (patch) | |
tree | 6a70e96bb9d87365f4bcbf8c58025a0d93c96078 /pkgs/development/libraries/libsoup/default.nix | |
parent | f9e75352cf610360d43806bb09671d013c881cc9 (diff) | |
parent | 1a52c7659dda87a8186d2a5482e49170b3989afa (diff) | |
download | nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.gz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.bz2 nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.lz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.xz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.zst nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.zip |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/development/libraries/libsoup/default.nix')
-rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 08784a0f2574..3e829dc421a0 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl, glib, libxml2, pkgconfig +{ stdenv, fetchurl, glib, libxml2, pkgconfig, intltool, python , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }: stdenv.mkDerivation { - name = "libsoup-2.38.1"; + name = "libsoup-2.40.3"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.38/libsoup-2.38.1.tar.xz; - sha256 = "16iza4y8pmc4sn90iid88fgminvgcqypy3s2qnmzkzm5qwzr5f3i"; + url = mirror://gnome/sources/libsoup/2.40/libsoup-2.40.3.tar.xz; + sha256 = "82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9"; }; + nativeBuildInputs = [ pkgconfig intltool python ]; - nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ]; + passthru.propagatedUserEnvPackages = [ glib_networking ]; # glib_networking is a runtime dependency, not a compile-time dependency configureFlags = "--disable-tls-check"; + preConfigure = '' + substituteInPlace libsoup/tld-parser.py \ + --replace "/usr/bin/env python" ${python}/bin/python + ''; + meta = { inherit (glib.meta) maintainers platforms; }; |