From fe7a2600ac35c463b303e3e8c312d704e5ec0ae0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 10 May 2022 00:35:42 +0300 Subject: [PATCH] aravis: remove useless nulls --- pkgs/development/libraries/aravis/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index 67e621ad859..6f2d241070f 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool , audit, glib, libusb1, libxml2 , wrapGAppsHook -, gstreamer ? null -, gst-plugins-base ? null -, gst-plugins-good ? null -, gst-plugins-bad ? null -, libnotify ? null -, gnome ? null -, gtk3 ? null +, gstreamer +, gst-plugins-base +, gst-plugins-good +, gst-plugins-bad +, libnotify +, gnome +, gtk3 , enableUsb ? true , enablePacketSocket ? true , enableViewer ? true @@ -23,11 +23,7 @@ let (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0") [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; in - assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableViewer -> enableGstPlugin; - assert enableViewer -> libnotify != null; - assert enableViewer -> gnome != null; - assert enableViewer -> gtk3 != null; assert enableViewer -> gstreamerAtLeastVersion1; stdenv.mkDerivation rec { @@ -87,4 +83,3 @@ in platforms = lib.platforms.unix; }; } -