From 9c066735d548733061f0a18b19d2267227206ccb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Aug 2018 17:20:20 +0200 Subject: [PATCH] =?UTF-8?q?gnome3.gnome-bluetooth:=203.28.1=20=E2=86=92=20?= =?UTF-8?q?3.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/core/gnome-bluetooth/default.nix | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index d65f282e03b..e7acbe8706e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,28 +1,47 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }: +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection +, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: -stdenv.mkDerivation rec { - name = "gnome-bluetooth-${version}"; - version = "3.28.1"; +let + pname = "gnome-bluetooth"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "3.28.2"; + + # TODO: split out "lib" + outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1g3yrq5792qvc5rxnf26cgciawrca27hqn6wxfcf63bpa2dsjcsn"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-bluetooth"; attrPath = "gnome3.gnome-bluetooth"; }; - }; + nativeBuildInputs = [ + meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection + gtk-doc docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ + glib gtk3 udev libnotify libcanberra-gtk3 + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + ]; - nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; - buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ]; + mesonFlags = [ + "-Dicon_update=false" + "-Dgtk_doc=true" + ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; description = "Application that let you manage Bluetooth in the GNOME destkop";