Convert all jack references to libjack2

This commit is contained in:
William A. Kennington III
2015-06-27 00:17:52 -07:00
parent 8ce4cb4de8
commit 7297255019
73 changed files with 156 additions and 156 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, faac, jack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }:
{ stdenv, fetchurl, alsaLib, faac, libjack2, lame, libopus, libpulseaudio, libsamplerate, libvorbis }:
with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-alsa-prefix=${alsaLib}"
"--with-faac-prefix=${faac}"
"--with-jack-prefix=${jack2}"
"--with-jack-prefix=${libjack2}"
"--with-lame-prefix=${lame}"
"--with-opus-prefix=${libopus}"
"--with-pulseaudio-prefix=${libpulseaudio}"
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, which, pkgconfig
, ocaml, ocamlPackages
, libao, portaudio, alsaLib, libpulseaudio, jack2
, libao, portaudio, alsaLib, libpulseaudio, libjack2
, libsamplerate, libmad, taglib, lame, libogg
, libvorbis, speex, libtheora, libopus, fdk_aac
, faad2, flac, ladspaH, ffmpeg, frei0r, dssi
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
buildInputs =
[ which ocaml ocamlPackages.findlib pkgconfig
libao portaudio alsaLib libpulseaudio jack2
libao portaudio alsaLib libpulseaudio libjack2
libsamplerate libmad taglib lame libogg
libvorbis speex libtheora libopus fdk_aac
faad2 flac ladspaH ffmpeg frei0r dssi
+3 -3
View File
@@ -1,4 +1,4 @@
{ composableDerivation, stdenv, fetchurl, alsaLib, jack2, ncurses }:
{ composableDerivation, stdenv, fetchurl, alsaLib, libjack2, ncurses }:
let inherit (composableDerivation) edf; in
@@ -30,8 +30,8 @@ composableDerivation.composableDerivation {} {
};
jack = {
audioModes = "jack";
buildInputs = [jack2];
NIX_LDFLAGS = ["-ljack -L${jack2}/lib64"];
buildInputs = [libjack2];
NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"];
};
} // edf { name = "ncurses"; enable = { buildInputs = [ncurses]; };};