blueberry: use gnome-bluetooth_1_0

main
Bobby Rong 2 years ago
parent 85dff10d06
commit baa0a8b9ef
No known key found for this signature in database
GPG Key ID: ED07364437C91161
  1. 7
      pkgs/tools/bluetooth/blueberry/default.nix
  2. 96
      pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix

@ -3,18 +3,15 @@
, fetchFromGitHub
, bluez-tools
, cinnamon
, gnome
, gobject-introspection
, intltool
, pavucontrol
, python3Packages
, util-linux
, wrapGAppsHook
, callPackage
}:
let
gnome-bluetooth = callPackage ./gnome-bluetooth.nix {};
in
stdenv.mkDerivation rec {
pname = "blueberry";
version = "1.4.7";
@ -35,7 +32,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bluez-tools
cinnamon.xapps
gnome-bluetooth
gnome.gnome-bluetooth_1_0
python3Packages.python
util-linux
];

@ -1,96 +0,0 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, gnome
, meson
, ninja
, pkg-config
, gtk3
, gettext
, glib
, udev
, itstool
, libxml2
, wrapGAppsHook
, libnotify
, libcanberra-gtk3
, gobject-introspection
, gtk-doc
, docbook-xsl-nons
, docbook_xml_dtd_43
, python3
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
pname = "gnome-bluetooth";
version = "3.34.5";
# TODO: split out "lib"
outputs = [ "out" "dev" "devdoc" "man" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c";
};
patches = [
# Fix build with meson 0.61.
# sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/commit/755fd758f866d3a3f7ca482942beee749f13a91e.patch";
sha256 = "sha256-N0MJ0pYO411o2CTNZHWmEoG2m5TGUjR6YW6HSXHTR/A=";
})
];
nativeBuildInputs = [
meson
ninja
gettext
itstool
pkg-config
libxml2
wrapGAppsHook
gobject-introspection
gtk-doc
docbook-xsl-nons
docbook_xml_dtd_43
python3
];
buildInputs = [
glib
gtk3
udev
libnotify
libcanberra-gtk3
gnome.adwaita-icon-theme
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 = gnome.updateScript {
packageName = pname;
attrPath = "gnome.${pname}";
};
};
meta = with lib; {
homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en";
description = "Application that let you manage Bluetooth in the GNOME destkop";
maintainers = teams.gnome.members;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
Loading…
Cancel
Save