about summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-11-19 19:01:54 +0000
committerGitHub <noreply@github.com>2019-11-19 19:01:54 +0000
commit504094dfbbb15797fe89a9d00fb1fa0cdbeca2f9 (patch)
tree170b8a4598ee5783efd76b94ae538eafcd862de5
parentf7f1724ee9dca565be84f6df64ed8b1b1a1c6be2 (diff)
parent61d1338f2552e5bb1532fe5c4f9ee918b3b9c90f (diff)
downloadnixlib-504094dfbbb15797fe89a9d00fb1fa0cdbeca2f9.tar
nixlib-504094dfbbb15797fe89a9d00fb1fa0cdbeca2f9.tar.gz
nixlib-504094dfbbb15797fe89a9d00fb1fa0cdbeca2f9.tar.bz2
nixlib-504094dfbbb15797fe89a9d00fb1fa0cdbeca2f9.tar.lz
nixlib-504094dfbbb15797fe89a9d00fb1fa0cdbeca2f9.tar.xz
nixlib-504094dfbbb15797fe89a9d00fb1fa0cdbeca2f9.tar.zst
nixlib-504094dfbbb15797fe89a9d00fb1fa0cdbeca2f9.zip
Merge pull request #73779 from worldofpeace/jack2-arm-fix-build
jack2: 1.9.13 -> 1.9.14, fix build arm
-rw-r--r--pkgs/misc/jackaudio/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 4bd0a96fb3ac..f6eaa553bb26 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -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 ];