jack2Full: deprecate alias

This commit is contained in:
Sandro Jäckel 2021-03-14 17:03:47 +01:00
parent 94fa194b9f
commit dd9862ba98
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
8 changed files with 14 additions and 13 deletions

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, alsaLib, jack2Full, minixml, pkg-config }: { lib, stdenv, fetchurl, alsaLib, jack2, minixml, pkg-config }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = packageName + "-" + version ; name = packageName + "-" + version ;
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
doCheck = false; doCheck = false;
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ alsaLib minixml jack2Full ]; buildInputs = [ alsaLib minixml jack2 ];
meta = with lib; { meta = with lib; {
description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files"; description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files";

View file

@ -1,6 +1,6 @@
{ faust { faust
, gtk2 , gtk2
, jack2Full , jack2
, alsaLib , alsaLib
, opencv , opencv
, libsndfile , libsndfile
@ -18,7 +18,7 @@ faust.wrapWithBuildEnv {
propagatedBuildInputs = [ propagatedBuildInputs = [
gtk2 gtk2
jack2Full jack2
alsaLib alsaLib
opencv opencv
libsndfile libsndfile

View file

@ -1,5 +1,5 @@
{ faust { faust
, jack2Full , jack2
, qt4 , qt4
, libsndfile , libsndfile
, alsaLib , alsaLib
@ -16,7 +16,7 @@ faust.wrapWithBuildEnv {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
jack2Full jack2
qt4 qt4
libsndfile libsndfile
alsaLib alsaLib

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper { lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper
, libsndfile, jack2Full , libsndfile, jack2
, libGLU, libGL, lv2, cairo , libGLU, libGL, lv2, cairo
, ladspaH, php }: , ladspaH, php }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkg-config php makeWrapper ]; nativeBuildInputs = [ pkg-config php makeWrapper ];
buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; buildInputs = [ jack2 libsndfile libGLU libGL lv2 cairo ladspaH ];
makeFlags = [ makeFlags = [
"PREFIX=${placeholder "out"}" "PREFIX=${placeholder "out"}"

View file

@ -9,7 +9,7 @@
, pkg-config , pkg-config
, boost , boost
, bash , bash
, jack2Full , jack2
, supercollider , supercollider
, qwt , qwt
, osmid , osmid
@ -102,7 +102,7 @@ mkDerivation rec {
dontWrapQtApps = true; dontWrapQtApps = true;
preFixup = '' preFixup = ''
wrapQtApp "$out/bin/sonic-pi" \ wrapQtApp "$out/bin/sonic-pi" \
--prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \ --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2}/bin \
--set AUBIO_LIB "${aubio}/lib/libaubio.so" --set AUBIO_LIB "${aubio}/lib/libaubio.so"
''; '';

View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper { lib, stdenv, fetchurl, makeWrapper
, expat, fftwFloat, fontconfig, freetype, libjack2, jack2Full, libclthreads, libclxclient , expat, fftwFloat, fontconfig, freetype, libjack2, jack2, libclthreads, libclxclient
, libsndfile, libxcb, xorg , libsndfile, libxcb, xorg
}: }:
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
# Make sure Jack is avalable in $PATH for tetraproc # Make sure Jack is avalable in $PATH for tetraproc
wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2Full}/bin" wrapProgram $out/bin/tetraproc --prefix PATH : "${jack2}/bin"
''; '';
meta = with lib; { meta = with lib; {

View file

@ -311,6 +311,7 @@ mapAliases ({
inotifyTools = inotify-tools; inotifyTools = inotify-tools;
inter-ui = inter; # added 2021-03-27 inter-ui = inter; # added 2021-03-27
i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21 i-score = throw "i-score has been removed: abandoned upstream."; # added 2020-11-21
jack2Full = jack2; # moved from top-level 2021-03-14
jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21 jamomacore = throw "jamomacore has been removed: abandoned upstream."; # added 2020-11-21
jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15 jbidwatcher = throw "jbidwatcher was discontinued in march 2021"; # added 2021-03-15
jbuilder = dune_1; # added 2018-09-09 jbuilder = dune_1; # added 2018-09-09

View file

@ -29496,8 +29496,8 @@ in
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate; inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate;
inherit (darwin) libobjc; inherit (darwin) libobjc;
}; };
libjack2 = jack2.override { prefix = "lib"; }; libjack2 = jack2.override { prefix = "lib"; };
jack2Full = jack2; # TODO: move to aliases.nix
j2cli = with python3Packages; toPythonApplication j2cli; j2cli = with python3Packages; toPythonApplication j2cli;