forked from mirrors/nixpkgs
libjack2: don't use with lib
at top-level
It's bit us once already [0], let's get rid of it before it does it again. [0]: https://github.com/NixOS/nixpkgs/pull/216096#issuecomment-1437763295
This commit is contained in:
parent
76305f698e
commit
ee197b2f33
|
@ -14,7 +14,6 @@
|
|||
, testers
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
inherit (python3Packages) python dbus-python;
|
||||
shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
|
||||
|
@ -41,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [ pkg-config python makeWrapper wafHook ];
|
||||
buildInputs = [ libsamplerate libsndfile readline eigen celt
|
||||
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
aften AudioUnit CoreAudio Accelerate libobjc
|
||||
];
|
||||
|
||||
|
@ -54,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
wafConfigureFlags = [
|
||||
"--classic"
|
||||
"--autostart=${if (optDbus != null) then "dbus" else "classic"}"
|
||||
] ++ optional (optDbus != null) "--dbus"
|
||||
++ optional (optLibffado != null) "--firewire"
|
||||
++ optional (optAlsaLib != null) "--alsa";
|
||||
] ++ lib.optional (optDbus != null) "--dbus"
|
||||
++ lib.optional (optLibffado != null) "--firewire"
|
||||
++ lib.optional (optAlsaLib != null) "--alsa";
|
||||
|
||||
postInstall = (if libOnly then ''
|
||||
rm -rf $out/{bin,share}
|
||||
|
@ -67,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "JACK audio connection kit, version 2 with jackdbus";
|
||||
homepage = "https://jackaudio.org";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
Loading…
Reference in a new issue