MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #20083 from magnetophon/libjack2-git

Browse source 
libjack2-git: 2015-09-03 -> 2016-08-18
This commit is contained in:
Frederik Rietdijk 2016-11-02 12:53:45 +01:00 committed by GitHub
commit f64933596c
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libsoundio/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }: { stdenv, fetchFromGitHub, cmake, alsaLib, libjack2Unstable, libpulseaudio }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.0"; version = "1.1.0";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p"; sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p";
}; };
buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ]; buildInputs = [ cmake alsaLib libjack2Unstable libpulseaudio ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Cross platform audio input and output"; description = "Cross platform audio input and output";

12
pkgs/misc/jackaudio/git.nix → pkgs/misc/jackaudio/unstable.git
View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper { stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline , bash, libsamplerate, libsndfile, readline, eigen, celt
# Optional Dependencies # Optional Dependencies
, dbus ? null, libffado ? null, alsaLib ? null , dbus ? null, libffado ? null, alsaLib ? null
@ -23,21 +23,21 @@ let
optLibopus = shouldUsePkg libopus; optLibopus = shouldUsePkg libopus;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${prefix}jack2-${version}"; name = "${prefix}jack2-unstable-${version}";
version = "2015-09-03"; version = "2016-08-18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jackaudio"; owner = "jackaudio";
repo = "jack2"; repo = "jack2";
rev = "2e8c5502c692a25f1c0213f3f7eeba1f4434da3c"; rev = "f2ece2418c875eb7e7ac3d25fbb484ddda47ab46";
sha256 = "0r1xdshm251yqb748r5l5f6xpznhwlqyyxkky7vgx5m2q51qb0a1"; sha256 = "0cvb0m6qz3k8a5njwyw65l4y3izi2rsh512hv5va97kjc6wzzx4j";
}; };
nativeBuildInputs = [ pkgconfig python makeWrapper ]; nativeBuildInputs = [ pkgconfig python makeWrapper ];
buildInputs = [ buildInputs = [
python python
libsamplerate libsndfile readline libsamplerate libsndfile readline eigen celt
optDbus optPythonDBus optLibffado optAlsaLib optLibopus optDbus optPythonDBus optLibffado optAlsaLib optLibopus
]; ];

4
pkgs/top-level/all-packages.nix
View file

@ -7077,7 +7077,7 @@ in
#GMP ex-satellite, so better keep it near gmp #GMP ex-satellite, so better keep it near gmp
mpfr = callPackage ../development/libraries/mpfr/default.nix { }; mpfr = callPackage ../development/libraries/mpfr/default.nix { };
mpfi = callPackage ../development/libraries/mpfi { }; mpfi = callPackage ../development/libraries/mpfi { };
# A GMP fork # A GMP fork
@ -16994,7 +16994,7 @@ in
libopus = libopus.override { withCustomModes = true; }; libopus = libopus.override { withCustomModes = true; };
}; };
libjack2 = jack2Full.override { prefix = "lib"; }; libjack2 = jack2Full.override { prefix = "lib"; };
libjack2-git = callPackage ../misc/jackaudio/git.nix { }; libjack2Unstable = callPackage ../misc/jackaudio/unstable.nix { };
keynav = callPackage ../tools/X11/keynav { }; keynav = callPackage ../tools/X11/keynav { };