From 26e552ee1992c44a228ccb88a0f435e54716310e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sat, 19 Feb 2022 14:05:26 +0100 Subject: [PATCH] blueberry: use old version of gnome-bluetooth for the time being The new version is incompatible (see https://github.com/linuxmint/blueberry/issues/123) This re-adds the old one, but just for blueberry, until the compatibility issue is fully resolved --- pkgs/tools/bluetooth/blueberry/default.nix | 7 +- .../bluetooth/blueberry/gnome-bluetooth.nix | 86 +++++++++++++++++++ 2 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 5616560108cf..bbc3babbd132 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -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"; @@ -32,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools cinnamon.xapps - gnome.gnome-bluetooth + gnome-bluetooth python3Packages.python util-linux ]; diff --git a/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix b/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix new file mode 100644 index 000000000000..07b77c04994d --- /dev/null +++ b/pkgs/tools/bluetooth/blueberry/gnome-bluetooth.nix @@ -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; + }; +}