jack2: Don't use special libs for NetJack (#400004)

jopejoe1 c3e53537 5985f13b

Changed files
+1 -8
pkgs
misc
jackaudio
top-level
-5
pkgs/misc/jackaudio/default.nix
···
python3Packages,
makeWrapper,
libsamplerate,
-
celt,
wafHook,
# Darwin Dependencies
aften,
···
dbus ? null,
libffado ? null,
alsa-lib ? null,
-
libopus ? null,
# Extra options
prefix ? "",
···
optPythonDBus = if libOnly then null else shouldUsePkg dbus-python;
optLibffado = if libOnly then null else shouldUsePkg libffado;
optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib;
-
optLibopus = shouldUsePkg libopus;
in
stdenv.mkDerivation (finalAttrs: {
pname = "${prefix}jack2";
···
buildInputs =
[
libsamplerate
-
celt
optDbus
optPythonDBus
optLibffado
optAlsaLib
-
optLibopus
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
aften
···
python3Packages,
makeWrapper,
libsamplerate,
wafHook,
# Darwin Dependencies
aften,
···
dbus ? null,
libffado ? null,
alsa-lib ? null,
# Extra options
prefix ? "",
···
optPythonDBus = if libOnly then null else shouldUsePkg dbus-python;
optLibffado = if libOnly then null else shouldUsePkg libffado;
optAlsaLib = if libOnly then null else shouldUsePkg alsa-lib;
in
stdenv.mkDerivation (finalAttrs: {
pname = "${prefix}jack2";
···
buildInputs =
[
libsamplerate
optDbus
optPythonDBus
optLibffado
optAlsaLib
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
aften
+1 -3
pkgs/top-level/all-packages.nix
···
# using the new configuration style proposal which is unstable
jack1 = callPackage ../misc/jackaudio/jack1.nix { };
-
jack2 = callPackage ../misc/jackaudio {
-
libopus = libopus.override { withCustomModes = true; };
-
};
libjack2 = jack2.override { prefix = "lib"; };
···
# using the new configuration style proposal which is unstable
jack1 = callPackage ../misc/jackaudio/jack1.nix { };
+
jack2 = callPackage ../misc/jackaudio { };
libjack2 = jack2.override { prefix = "lib"; };