From 02b013b9306b1779bedcd712a1a4c29e249a6fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 25 Nov 2022 13:34:29 -0800 Subject: [PATCH] jackmix: build using python3 --- pkgs/applications/audio/jackmix/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index e9d2abee91cd..ed2d2a499303 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -1,4 +1,6 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib }: +{ mkDerivation, lib, fetchFromGitHub, pkg-config, sconsPackages, qtbase, lash, libjack2, jack ? libjack2, alsa-lib +, fetchpatch +}: mkDerivation rec { pname = "jackmix"; @@ -11,9 +13,16 @@ mkDerivation rec { sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h"; }; - patches = [ ./no_error.patch ]; + patches = [ + ./no_error.patch + (fetchpatch { + name = "sconstruct-python3.patch"; + url = "https://github.com/kampfschlaefer/jackmix/commit/3a0c868b267728fdbc69cc3dc1941edac27d97f6.patch"; + hash = "sha256-MLgxIiZ0+C1IVEci9Q347DR+SJUlPG2N3iPvuhRptJU="; + }) + ]; - nativeBuildInputs = [ sconsPackages.scons_3_1_2 pkg-config ]; + nativeBuildInputs = [ sconsPackages.scons_latest pkg-config ]; buildInputs = [ qtbase lash