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:
worldofpeace 2019-11-19 19:01:54 +00:00 committed by GitHub
commit 504094dfbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
, fetchpatch
{ stdenv, fetchFromGitHub, pkgconfig, python3Packages, makeWrapper
, bash, libsamplerate, libsndfile, readline, eigen, celt
, wafHook
# Darwin Dependencies
@ -15,7 +14,7 @@
with stdenv.lib;
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;
libOnly = prefix == "lib";
@ -28,13 +27,13 @@ let
in
stdenv.mkDerivation rec {
name = "${prefix}jack2-${version}";
version = "1.9.13";
version = "1.9.14";
src = fetchFromGitHub {
owner = "jackaudio";
repo = "jack2";
rev = "v${version}";
sha256 = "1dnq75ylcv3npsyvzzkj0g8mdnzwis1whc2pk6s5hkcc1bgvv2xy";
sha256 = "1prxg1l8wrxfp2mh7l4mvjvmml6816fciq1la88ylhwm1qnfvnax";
};
nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ];