From 5c753f53d8bc74fe03c975db9e43570faf5ebc95 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 2 Jan 2019 01:24:08 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"gssdp:=201.0.2=20=E2=86=92=201.1.1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 01a6191107ef67c32e749edf8857271cd0cba60b. --- pkgs/development/libraries/gssdp/default.nix | 23 +++++++------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 460c4f2b8ac..ed1e5b6faab 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -1,33 +1,26 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib, gnome3 }: +{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }: stdenv.mkDerivation rec { - pname = "gssdp"; - version = "1.1.1"; + name = "gssdp-${version}"; + version = "1.0.2"; outputs = [ "out" "bin" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xwykd2ks3nyy67kirxbcl0xplj7mdjx5m3pqvgja129k0b1kf99"; + url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1"; }; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ]; buildInputs = [ libsoup gtk3 ]; propagatedBuildInputs = [ glib ]; - mesonFlags = [ - "-Dgtk_doc=true" + configureFlags = [ + "--enable-gtk-doc" ]; doCheck = true; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - meta = with stdenv.lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; homepage = http://www.gupnp.org/;