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/misc/jackaudio/default.nix
+4 -3
View File
@@ -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;
pkgs/misc/jackaudio/git.nix
+4 -3
View File
@@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper
{ stdenv, fetchFromGitHub, pkgconfig, pythonPackages, makeWrapper
, bash, libsamplerate, libsndfile, readline
# 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;