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.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, pythonPackages, makeWrapper
|
||||
, bash, libsamplerate, libsndfile, readline, gcc
|
||||
|
||||
# Optional Dependencies
|
||||
, dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null
|
||||
, dbus ? null, libffado ? null, alsaLib ? null
|
||||
, libopus ? null
|
||||
|
||||
# Extra options
|
||||
@@ -11,12 +11,13 @@
|
||||
|
||||
with stdenv.lib;
|
||||
let
|
||||
inherit (pythonPackages) python dbus-python;
|
||||
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
|
||||
|
||||
libOnly = prefix == "lib";
|
||||
|
||||
optDbus = shouldUsePkg dbus;
|
||||
optPythonDBus = if libOnly then null else shouldUsePkg pythonDBus;
|
||||
optPythonDBus = if libOnly then null else shouldUsePkg dbus-python;
|
||||
optLibffado = if libOnly then null else shouldUsePkg libffado;
|
||||
optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
|
||||
optLibopus = shouldUsePkg libopus;
|
||||
|
||||
Reference in New Issue
Block a user