libjack2-git: 2015-09-03 -> 2016-08-18
This commit is contained in:
parent
cd67a0aada
commit
d315ca4080
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }:
|
||||
{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2Unstable, libpulseaudio }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.1.0";
|
||||
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ];
|
||||
buildInputs = [ cmake alsaLib libjack2Unstable libpulseaudio ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Cross platform audio input and output";
|
||||
|
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
|
||||
, bash, libsamplerate, libsndfile, readline
|
||||
, bash, libsamplerate, libsndfile, readline, eigen, celt
|
||||
|
||||
# Optional Dependencies
|
||||
, dbus ? null, libffado ? null, alsaLib ? null
|
||||
@ -23,21 +23,21 @@ let
|
||||
optLibopus = shouldUsePkg libopus;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${prefix}jack2-${version}";
|
||||
version = "2015-09-03";
|
||||
name = "${prefix}jack2-unstable-${version}";
|
||||
version = "2016-08-18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jackaudio";
|
||||
repo = "jack2";
|
||||
rev = "2e8c5502c692a25f1c0213f3f7eeba1f4434da3c";
|
||||
sha256 = "0r1xdshm251yqb748r5l5f6xpznhwlqyyxkky7vgx5m2q51qb0a1";
|
||||
rev = "f2ece2418c875eb7e7ac3d25fbb484ddda47ab46";
|
||||
sha256 = "0cvb0m6qz3k8a5njwyw65l4y3izi2rsh512hv5va97kjc6wzzx4j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python makeWrapper ];
|
||||
buildInputs = [
|
||||
python
|
||||
|
||||
libsamplerate libsndfile readline
|
||||
libsamplerate libsndfile readline eigen celt
|
||||
|
||||
optDbus optPythonDBus optLibffado optAlsaLib optLibopus
|
||||
];
|
@ -16994,7 +16994,7 @@ in
|
||||
libopus = libopus.override { withCustomModes = true; };
|
||||
};
|
||||
libjack2 = jack2Full.override { prefix = "lib"; };
|
||||
libjack2-git = callPackage ../misc/jackaudio/git.nix { };
|
||||
libjack2Unstable = callPackage ../misc/jackaudio/unstable.nix { };
|
||||
|
||||
keynav = callPackage ../tools/X11/keynav { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user