From c5277d01c504f3c0a7fe480b9308e83995860e29 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 20 Oct 2020 13:53:13 +0200 Subject: [PATCH 1/2] faust2jack: use opencv instead of opencv2 opencv2 is marked broken: https://github.com/NixOS/nixpkgs/commit/5e68d203f3f8abf8f928fb6788487b83e3a0e8ec This reverts https://github.com/NixOS/nixpkgs/commit/f68a0031bbf49dde2cf4026dc6d45d7f3835dc0b --- pkgs/applications/audio/faust/faust2jack.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 0f703704961..dd4cdd29c66 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -2,7 +2,7 @@ , gtk2 , jack2Full , alsaLib -, opencv2 +, opencv , libsndfile , which }: @@ -20,7 +20,7 @@ faust.wrapWithBuildEnv { gtk2 jack2Full alsaLib - opencv2 + opencv libsndfile which ]; From 5461c5f633b0353e499e912b4f9e925fe84719ff Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 20 Oct 2020 13:44:06 +0200 Subject: [PATCH 2/2] faust2jaqt: remove opencv2 It's marked broken and it seems it wasn't needed in here in the first place. https://github.com/NixOS/nixpkgs/commit/5e68d203f3f8abf8f928fb6788487b83e3a0e8ec --- pkgs/applications/audio/faust/faust2jaqt.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 753208c54c2..76e4b5ce8db 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -1,6 +1,5 @@ { faust , jack2Full -, opencv2 , qt4 , libsndfile , alsaLib @@ -18,7 +17,6 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ jack2Full - opencv2 qt4 libsndfile alsaLib