diff options
| author | Winter <winter@winter.cafe> | 2023-02-20 22:35:23 -0500 |
|---|---|---|
| committer | Winter <winter@winter.cafe> | 2023-02-20 22:38:48 -0500 |
| commit | ee197b2f3311ba86514e61b2576d70c2ce96eca3 (patch) | |
| tree | b960c52049f31337a49dfe780388aa763c969892 /pkgs/misc | |
| parent | 76305f698e51999b77552935acc2fcd51369d535 (diff) | |
| download | nixpkgs-ee197b2f3311ba86514e61b2576d70c2ce96eca3.tar nixpkgs-ee197b2f3311ba86514e61b2576d70c2ce96eca3.tar.gz nixpkgs-ee197b2f3311ba86514e61b2576d70c2ce96eca3.tar.bz2 nixpkgs-ee197b2f3311ba86514e61b2576d70c2ce96eca3.tar.lz nixpkgs-ee197b2f3311ba86514e61b2576d70c2ce96eca3.tar.xz nixpkgs-ee197b2f3311ba86514e61b2576d70c2ce96eca3.tar.zst nixpkgs-ee197b2f3311ba86514e61b2576d70c2ce96eca3.zip | |
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
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/jackaudio/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index dd7c05d1ad2..536c654f0be 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -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; |