diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-27 00:17:52 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-27 00:17:52 -0700 |
| commit | 729725501922fad5955b86bf0e06a2f6fee659f6 (patch) | |
| tree | 0c1035bd915dafc8c7d8635df1e865cff7689422 /pkgs/tools | |
| parent | 8ce4cb4de81fd2b79d8e99e74be4e4a1c481f030 (diff) | |
| download | nixlib-729725501922fad5955b86bf0e06a2f6fee659f6.tar nixlib-729725501922fad5955b86bf0e06a2f6fee659f6.tar.gz nixlib-729725501922fad5955b86bf0e06a2f6fee659f6.tar.bz2 nixlib-729725501922fad5955b86bf0e06a2f6fee659f6.tar.lz nixlib-729725501922fad5955b86bf0e06a2f6fee659f6.tar.xz nixlib-729725501922fad5955b86bf0e06a2f6fee659f6.tar.zst nixlib-729725501922fad5955b86bf0e06a2f6fee659f6.zip | |
Convert all jack references to libjack2
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/audio/darkice/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/audio/liquidsoap/full.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/timidity/default.nix | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index 8a9393cd1f63..edc8fe2dffc8 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -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}" diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 1da9a6f465c9..859fe4bb1830 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -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 diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 664647514aa1..5655e27dc2e6 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -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]; };}; |