public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #112405 from alyssais/jack

Browse Source 
libjack2: fix cross
This commit is contained in:
Florian Klink 2021-02-08 17:10:07 +01:00 committed by GitHub
commit 05f5d0270f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/misc/jackaudio/default.nix
View File

@ -48,6 +48,9 @@ stdenv.mkDerivation rec {
--replace /bin/bash ${bash}/bin/bash --replace /bin/bash ${bash}/bin/bash
''; '';
PKGCONFIG = "${stdenv.cc.targetPrefix}pkg-config";
dontAddWafCrossFlags = "true";
wafConfigureFlags = [ wafConfigureFlags = [
"--classic" "--classic"
"--autostart=${if (optDbus != null) then "dbus" else "classic"}" "--autostart=${if (optDbus != null) then "dbus" else "classic"}"

3
pkgs/os-specific/linux/alsa-plugins/default.nix
View File

@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ alsaLib libogg ] [ alsaLib libogg ]
++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libpulseaudio != null) libpulseaudio
# https://github.com/NixOS/nixpkgs/issues/96548 ++ lib.optional (libjack2 != null) libjack2;
++ lib.optional (libjack2 != null && (stdenv.buildPlatform == stdenv.hostPlatform)) libjack2;
meta = with lib; { meta = with lib; {
description = "Various plugins for ALSA"; description = "Various plugins for ALSA";