diff options
| author | Robert Schütz <rschuetz17@gmail.com> | 2018-08-06 01:09:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-06 01:09:59 +0200 |
| commit | e3f9a5fd0aeb81bcdf95ddf9a6ec75c9294589e0 (patch) | |
| tree | 847df7720467c158de0d59d9acb994b5a62f8a0a | |
| parent | Merge pull request #44398 from dotlambda/blueman-python3 (diff) | |
| download | nixpkgs-origin/revert-44398-blueman-python3.tar.gz | |
Revert "bluez: use python3"origin/revert-44398-blueman-python3
| -rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/bluetooth/blueman/default.nix | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 3882a7425869..b095096caa76 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, - python3, readline, udev, libical, + pythonPackages, readline, udev, libical, systemd, enableWiimote ? false, enableMidi ? false }: stdenv.mkDerivation rec { @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { sha256 = "048r91vx9gs5nwwbah2s0xig04nwk14c5s0vb7qmaqdvighsmz2z"; }; - pythonPath = with python3.pkgs; [ + pythonPath = with pythonPackages; [ dbus-python pygobject2 pygobject3 recursivePthLoader ]; buildInputs = [ - dbus glib alsaLib python3 python3.pkgs.wrapPython + dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython readline udev libical ]; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 29c9a21465c7..da562fde1603 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,10 +1,9 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 +{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, 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 { |