diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-16 22:51:21 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-16 22:52:37 +0200 |
| commit | 5a501bd828b19e9cef4589b3b9dc2852401a2882 (patch) | |
| tree | 49be7194446f7258b197ff0f29fc00d8eb939f02 /pkgs/os-specific/linux/bluez/default.nix | |
| parent | 6b23bd99a31a450fede964206153ddd5ac76a22f (diff) | |
| download | nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.gz nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.bz2 nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.lz nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.xz nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.tar.zst nixlib-5a501bd828b19e9cef4589b3b9dc2852401a2882.zip | |
Remove top-level dbus_python and pythonDBus.
See #11567. Furthermore, it renames pythonPackages.dbus to pythonPackages.dbus- python as that's the name upstream uses. There is a small rebuild but I couldn't figure out the actual cause.
Diffstat (limited to 'pkgs/os-specific/linux/bluez/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/bluez/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index ea979ed0c22b..9943a1de6d4b 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, python, makeWrapper -, pythonDBus, pygobject, readline, libsndfile }: +{ stdenv, fetchurl, pkgconfig, dbus, glib, libusb, alsaLib, pythonPackages, makeWrapper +, readline, libsndfile }: assert stdenv.isLinux; let - pythonpath = "${pythonDBus}/lib/${python.libPrefix}/site-packages:" - + "${pygobject}/lib/${python.libPrefix}/site-packages"; -in - -stdenv.mkDerivation rec { + inherit (pythonPackages) python; + pythonpath = "${pythonPackages.dbus}/lib/${python.libPrefix}/site-packages:" + + "${pythonPackages.pygobject}/lib/${python.libPrefix}/site-packages"; +in stdenv.mkDerivation rec { name = "bluez-4.101"; src = fetchurl { |