summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-08-16 17:20:20 +0200
committerJan Tojnar <jtojnar@gmail.com>2018-08-25 15:57:22 +0200
commit9c066735d548733061f0a18b19d2267227206ccb (patch)
treec6de1bff153915b944ebf357598e1bc31e409f15 /pkgs/desktops
parentb55e3f64497e330da9e1de4fb6a4054c6b6bbf82 (diff)
downloadnixlib-9c066735d548733061f0a18b19d2267227206ccb.tar
nixlib-9c066735d548733061f0a18b19d2267227206ccb.tar.gz
nixlib-9c066735d548733061f0a18b19d2267227206ccb.tar.bz2
nixlib-9c066735d548733061f0a18b19d2267227206ccb.tar.lz
nixlib-9c066735d548733061f0a18b19d2267227206ccb.tar.xz
nixlib-9c066735d548733061f0a18b19d2267227206ccb.tar.zst
nixlib-9c066735d548733061f0a18b19d2267227206ccb.zip
gnome3.gnome-bluetooth: 3.28.1 → 3.28.2
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix43
1 files 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 d65f282e03b8..e7acbe8706ec 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";