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

Remove top-level dbus_python and pythonDBus.

Browse Source 
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.
This commit is contained in:
Frederik Rietdijk
2016-08-16 22:52:37 +02:00
parent 6b23bd99a3
commit 5a501bd828
45 changed files with 166 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/bluez/bluez5.nix
+4 -4
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, python,
pythonPackages, pythonDBus, readline, libsndfile, udev, libical,
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
pythonPackages, readline, libsndfile, udev, libical,
systemd, enableWiimote ? false }:
assert stdenv.isLinux;
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
};
pythonPath = with pythonPackages;
[ pythonDBus pygobject pygobject3 recursivePthLoader ];
[ dbus pygobject pygobject3 recursivePthLoader ];
buildInputs =
[ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython
[ pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
readline libsndfile udev libical
# Disables GStreamer; not clear what it gains us other than a
# zillion extra dependencies.
pkgs/os-specific/linux/bluez/bluez5_28.nix
+6 -4
View File
@@ -1,10 +1,12 @@
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib, python,
pythonPackages, pythonDBus, readline, libsndfile, udev, libical,
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
pythonPackages, readline, libsndfile, udev, libical,
systemd, enableWiimote ? false }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
let
inherit (pythonPackages) python;
in stdenv.mkDerivation rec {
name = "bluez-5.28";
src = fetchurl {
@@ -13,7 +15,7 @@ stdenv.mkDerivation rec {
};
pythonPath = with pythonPackages;
[ pythonDBus pygobject pygobject3 recursivePthLoader ];
[ dbus pygobject pygobject3 recursivePthLoader ];
buildInputs =
[ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython
pkgs/os-specific/linux/bluez/default.nix
+6 -7
View File
@@ -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 {