From 0fd688a1a5d51030c913e814b07ad69009e9bfa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Aug 2018 15:25:19 +0200 Subject: [PATCH 1/2] blueman: use python3Packages --- pkgs/tools/bluetooth/blueman/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index da562fde160..29c9a21465c 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -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 , hicolor-icon-theme, librsvg, wrapGAppsHook, gobjectIntrospection , withPulseAudio ? true, libpulseaudio }: let + pythonPackages = python3Packages; binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ]; in stdenv.mkDerivation rec { From 413d7f4425e3e3e1fa00becad89bb389f90b2413 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 3 Jun 2018 03:37:23 +0200 Subject: [PATCH 2/2] bluez: use python3 --- pkgs/os-specific/linux/bluez/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index b095096caa7..3882a742586 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, - pythonPackages, readline, udev, libical, + python3, readline, udev, libical, systemd, enableWiimote ? false, enableMidi ? false }: stdenv.mkDerivation rec { @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z"; }; - pythonPath = with pythonPackages; [ + pythonPath = with python3.pkgs; [ dbus-python pygobject2 pygobject3 recursivePthLoader ]; buildInputs = [ - dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython + dbus glib alsaLib python3 python3.pkgs.wrapPython readline udev libical ];