Merge pull request #67731 from averelld/blueman-upgrade

blueman: 2.0.8 -> 2.1.1
This commit is contained in:
Jan Tojnar 2019-09-03 11:47:05 +02:00 committed by GitHub
commit 3d367775e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 9 deletions

View File

@ -281,6 +281,7 @@
./services/databases/virtuoso.nix
./services/desktops/accountsservice.nix
./services/desktops/bamf.nix
./services/desktops/blueman.nix
./services/desktops/deepin/deepin.nix
./services/desktops/dleyna-renderer.nix
./services/desktops/dleyna-server.nix

View File

@ -0,0 +1,25 @@
# blueman service
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.services.blueman;
in {
###### interface
options = {
services.blueman = {
enable = mkEnableOption "blueman";
};
};
###### implementation
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.blueman ];
services.dbus.packages = [ pkgs.blueman ];
systemd.packages = [ pkgs.blueman ];
};
}

View File

@ -1,19 +1,21 @@
{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
, hicolor-icon-theme, librsvg, wrapGAppsHook, gobject-introspection
, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
, gnome3, librsvg, wrapGAppsHook, gobject-introspection
, withNetworkManager ?
config.networking.networkmanager.enable or false, networkmanager
, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
let
pythonPackages = python3Packages;
binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp iproute ];
in stdenv.mkDerivation rec {
pname = "blueman";
version = "2.0.8";
version = "2.1.1";
src = fetchurl {
url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "0kkh6jppqcn3yf70vnny1l015kxrz3dxw4g774gl02lh9ixx1bq4";
sha256 = "1hyvc5x97j8b4kvwzh58zzlc454d0h0hk440zbg8f5as9qrv5spi";
};
nativeBuildInputs = [
@ -21,19 +23,25 @@ in stdenv.mkDerivation rec {
pythonPackages.wrapPython wrapGAppsHook
];
buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor-icon-theme ]
buildInputs = [ bluez gtk3 pythonPackages.python librsvg
gnome3.adwaita-icon-theme iproute libappindicator ]
++ pythonPath
++ lib.optional withPulseAudio libpulseaudio;
++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withNetworkManager networkmanager;
postPatch = lib.optionalString withPulseAudio ''
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
'';
pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ];
pythonPath = with pythonPackages; [ pygobject3 pycairo ];
propagatedUserEnvPkgs = [ obex_data_server ];
configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
configureFlags = [
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
(lib.enableFeature withPulseAudio "pulseaudio")
];
postFixup = ''
makeWrapperArgs="--prefix PATH ':' ${binPath}"