public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44398 from dotlambda/blueman-python3

Browse Source 
bluez: use python3
This commit is contained in:
Silvan Mosberger 2018-08-05 23:50:39 +02:00 committed by GitHub
commit 56ac23a19c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/bluez/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
pythonPackages, readline, udev, libical, python3, readline, udev, libical,
systemd, enableWiimote ? false, enableMidi ? false }: systemd, enableWiimote ? false, enableMidi ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,12 +10,12 @@ stdenv.mkDerivation rec {
sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z"; sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z";
}; };
pythonPath = with pythonPackages; [ pythonPath = with python3.pkgs; [
dbus-python pygobject2 pygobject3 recursivePthLoader dbus-python pygobject2 pygobject3 recursivePthLoader
]; ];
buildInputs = [ buildInputs = [
dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython dbus glib alsaLib python3 python3.pkgs.wrapPython
readline udev libical readline udev libical
]; ];

3
pkgs/tools/bluetooth/blueman/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, gtk3 { stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp
, hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection
, withPulseAudio ? true, libpulseaudio }: , withPulseAudio ? true, libpulseaudio }:
let let
pythonPackages = python3Packages;
binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ]; binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {