diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-27 12:19:01 +0100 |
| commit | 6345089ca0af23a29387f48060a53dff0d0d30f5 (patch) | |
| tree | aa11989838217951662f46c011205e11d525e4dc /pkgs/development/libraries/libsoup/default.nix | |
| parent | 658951917437e7d587c8a206cc6497a7f1192891 (diff) | |
| parent | e69a3248f7c8308b0d583941e8f1bb1a99a431a7 (diff) | |
| download | nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.gz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.bz2 nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.lz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.xz nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.tar.zst nixlib-6345089ca0af23a29387f48060a53dff0d0d30f5.zip | |
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice in the history, but let's merge this way.
Diffstat (limited to 'pkgs/development/libraries/libsoup/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 229a92d84bf5..cdf24c79e5ef 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig , gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection -, valaSupport ? true, vala_0_32 +, valaSupport ? true, vala_0_38 , libintlOrEmpty , intltool, python }: let @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] - ++ stdenv.lib.optionals valaSupport [ vala_0_32 ]; + ++ stdenv.lib.optionals valaSupport [ vala_0_38 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ]; |