From 1ca5d3117c0e083140a6efd182824135bce41018 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 1 Feb 2021 19:17:58 +0100 Subject: [PATCH] binwalk: simplify visualizationSupport code --- pkgs/development/python-modules/binwalk/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 499d442c822..74d79bd677b 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -17,10 +17,10 @@ , matplotlib , nose , pycrypto -, pyqtgraph ? null }: +, pyqtgraph +, visualizationSupport ? false }: let - visualizationSupport = (pyqtgraph != null) && (matplotlib != null); version = "2.2.0"; in buildPythonPackage { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 716981fbc9e..35cf3439331 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -931,14 +931,10 @@ in { binho-host-adapter = callPackage ../development/python-modules/binho-host-adapter { }; - binwalk = callPackage ../development/python-modules/binwalk { - pyqtgraph = null; - matplotlib = null; - }; + binwalk = callPackage ../development/python-modules/binwalk { }; binwalk-full = appendToName "full" (self.binwalk.override { - pyqtgraph = self.pyqtgraph; - matplotlib = self.matplotlib; + visualizationSupport = true; }); biopython = callPackage ../development/python-modules/biopython { };