summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2022-11-25 13:34:29 -0800
committerRobert Schütz <nix@dotlambda.de>2022-11-25 13:52:35 -0800
commit02b013b9306b1779bedcd712a1a4c29e249a6fd6 (patch)
treefac2bea1b4a73f97a4d0124fc2a670cacc6a7823
parente62efc669497efe400eaa752bf6bdeb5893e3075 (diff)
downloadnixpkgs-02b013b9306b1779bedcd712a1a4c29e249a6fd6.tar
nixpkgs-02b013b9306b1779bedcd712a1a4c29e249a6fd6.tar.gz
nixpkgs-02b013b9306b1779bedcd712a1a4c29e249a6fd6.tar.bz2
nixpkgs-02b013b9306b1779bedcd712a1a4c29e249a6fd6.tar.lz
nixpkgs-02b013b9306b1779bedcd712a1a4c29e249a6fd6.tar.xz
nixpkgs-02b013b9306b1779bedcd712a1a4c29e249a6fd6.tar.zst
nixpkgs-02b013b9306b1779bedcd712a1a4c29e249a6fd6.zip
jackmix: build using python3
-rw-r--r--pkgs/applications/audio/jackmix/default.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index e9d2abee91c..ed2d2a49930 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