diff options
| author | Averell Dalton <averell+nixpkgs@rxd4.com> | 2019-08-29 03:25:04 +0200 |
|---|---|---|
| committer | Averell Dalton <averell+nixpkgs@rxd4.com> | 2019-09-03 10:26:54 +0200 |
| commit | e0850f8a94ce0ae937488e047e1c95701c8d1b73 (patch) | |
| tree | 6410b5794eb8337f38a4c23c798e51713fbeca7b /pkgs/tools/bluetooth | |
| parent | 79cfb44011f6a2a108e09112f5573aee56d02907 (diff) | |
blueman: 2.0.8 -> 2.1.1
Diffstat (limited to 'pkgs/tools/bluetooth')
| -rw-r--r-- | pkgs/tools/bluetooth/blueman/default.nix | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index b28e50d54b0..60c96ca78ce 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -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}" |