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/misc/jackaudio | |
| 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/misc/jackaudio')
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/misc/jackaudio/git.nix | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 66be12fbc43f..06389c01ce0c 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -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; diff --git a/pkgs/misc/jackaudio/git.nix b/pkgs/misc/jackaudio/git.nix index fb47128595e2..7deeaadbb10c 100644 --- a/pkgs/misc/jackaudio/git.nix +++ b/pkgs/misc/jackaudio/git.nix @@ -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; |