diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-08-05 23:50:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-05 23:50:39 +0200 |
| commit | 56ac23a19c2e77fd96694e6eda80225c364f699c (patch) | |
| tree | 1e97b03bf2e4778ce3b72d1e4f34f4451e8c3b09 /pkgs | |
| parent | 373d7277936a00e532cb203fe7b58cd27c0447cb (diff) | |
| parent | 413d7f4425e3e3e1fa00becad89bb389f90b2413 (diff) | |
| download | nixpkgs-56ac23a19c2e77fd96694e6eda80225c364f699c.tar nixpkgs-56ac23a19c2e77fd96694e6eda80225c364f699c.tar.gz nixpkgs-56ac23a19c2e77fd96694e6eda80225c364f699c.tar.bz2 nixpkgs-56ac23a19c2e77fd96694e6eda80225c364f699c.tar.lz nixpkgs-56ac23a19c2e77fd96694e6eda80225c364f699c.tar.xz nixpkgs-56ac23a19c2e77fd96694e6eda80225c364f699c.tar.zst nixpkgs-56ac23a19c2e77fd96694e6eda80225c364f699c.zip | |
Merge pull request #44398 from dotlambda/blueman-python3
bluez: use python3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/bluetooth/blueman/default.nix | 3 |
2 files changed, 5 insertions, 4 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 ]; 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 { |