Skip to content

Commit

Permalink
blueberry: use old version of gnome-bluetooth for the time being
Browse files Browse the repository at this point in the history
The new version is incompatible (see linuxmint/blueberry#123)

This re-adds the old one, but just for blueberry, until the
compatibility issue is fully resolved
  • Loading branch information
mkg20001 authored and jtojnar committed Mar 15, 2022
1 parent 247912d commit 2be5f01
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 2 deletions.
7 changes: 5 additions & 2 deletions pkgs/tools/bluetooth/blueberry/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
, 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";
Expand All @@ -32,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bluez-tools
cinnamon.xapps
gnome.gnome-bluetooth
gnome-bluetooth
python3Packages.python
util-linux
];
Expand Down
86 changes: 86 additions & 0 deletions pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{ lib
, stdenv
, fetchurl
, 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";
};

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;
};
}

0 comments on commit 2be5f01

Please sign in to comment.