diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:15:06 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-04-22 21:18:23 +0000 |
commit | b935ae5f3cfb2bb4f9a3746d284f156a6dece505 (patch) | |
tree | 5efe4e2e7a7723a737d0130a333b057c5e76df40 /nixpkgs/pkgs/development/libraries/glib-networking | |
parent | dc9566e91c9453378c24e98b5737234364670df5 (diff) | |
parent | d26027792812fbfad4d0f451b5f47fdabf7fdeb9 (diff) | |
download | nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.gz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.bz2 nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.lz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.xz nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.tar.zst nixlib-b935ae5f3cfb2bb4f9a3746d284f156a6dece505.zip |
Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glib-networking')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/glib-networking/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index e8105ef08237..ab5826bc796c 100644 --- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -3,14 +3,14 @@ let pname = "glib-networking"; - version = "2.58.0"; + version = "2.60.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0s006gs9nsq6mg31spqha1jffzmp6qjh10y27h0fxf1iw1ah5ymx"; + sha256 = "14jx8ca7plgh196629ghj41gsaha0aza222g64093hjsm8pnn76p"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ glib gnutls p11-kit libproxy gsettings-desktop-schemas ]; + mesonFlags = [ + # Default auto detection doesn't work + "-Dgnutls=enabled" + ]; + doCheck = false; # tests need to access the certificates (among other things) passthru = { |