Merge pull request #73779 from worldofpeace/jack2-arm-fix-build
jack2: 1.9.13 -> 1.9.14, fix build arm
This commit is contained in:
commit
504094dfbb
@ -1,5 +1,4 @@
|
|||||||
{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
|
{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper
|
||||||
, fetchpatch
|
|
||||||
, bash, libsamplerate, libsndfile, readline, eigen, celt
|
, bash, libsamplerate, libsndfile, readline, eigen, celt
|
||||||
, wafHook
|
, wafHook
|
||||||
# Darwin Dependencies
|
# Darwin Dependencies
|
||||||
@ -15,7 +14,7 @@
|
|||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
let
|
let
|
||||||
inherit (python2Packages) python dbus-python;
|
inherit (python3Packages) python dbus-python;
|
||||||
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
|
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) pkg.meta.platforms then pkg else null;
|
||||||
|
|
||||||
libOnly = prefix == "lib";
|
libOnly = prefix == "lib";
|
||||||
@ -28,13 +27,13 @@ let
|
|||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "${prefix}jack2-${version}";
|
name = "${prefix}jack2-${version}";
|
||||||
version = "1.9.13";
|
version = "1.9.14";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "jackaudio";
|
owner = "jackaudio";
|
||||||
repo = "jack2";
|
repo = "jack2";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "1dnq75ylcv3npsyvzzkj0g8mdnzwis1whc2pk6s5hkcc1bgvv2xy";
|
sha256 = "1prxg1l8wrxfp2mh7l4mvjvmml6816fciq1la88ylhwm1qnfvnax";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ];
|
nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ];
|
||||||
|
Loading…
Reference in New Issue
Block a user