diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
| commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
| tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/development/libraries/libsoup | |
| parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
| parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
| download | nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixpkgs-ae74c356d94b795eb07dfe9978788b49b70f5959.zip | |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/development/libraries/libsoup')
| -rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index b9a6c8341ef..aa84c507c97 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -3,15 +3,15 @@ , libintlOrEmpty , intltool, python }: let - majorVersion = "2.50"; - version = "${majorVersion}.0"; + majorVersion = "2.52"; + version = "${majorVersion}.2"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b"; + sha256 = "1p4k40y2gikr6m8p3hm0vswdzj2pj133dckipd2jk5bxbj5n4mfv"; }; patchPhase = '' @@ -27,7 +27,7 @@ stdenv.mkDerivation { passthru.propagatedUserEnvPackages = [ glib_networking.out ]; # glib_networking is a runtime dependency, not a compile-time dependency - configureFlags = "--disable-tls-check" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; + configureFlags = "--disable-tls-check --enable-vala=no" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; |