cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

aravis: remove useless nulls

Browse source
This commit is contained in:
Artturin 2022-05-10 00:35:42 +03:00
parent 3c2f3dff8d
commit fe7a2600ac
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/development/libraries/aravis/default.nix
View file

@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-doc, intltool
, audit, glib, libusb1, libxml2 , audit, glib, libusb1, libxml2
, wrapGAppsHook , wrapGAppsHook
, gstreamer ? null , gstreamer
, gst-plugins-base ? null , gst-plugins-base
, gst-plugins-good ? null , gst-plugins-good
, gst-plugins-bad ? null , gst-plugins-bad
, libnotify ? null , libnotify
, gnome ? null , gnome
, gtk3 ? null , gtk3
, enableUsb ? true , enableUsb ? true
, enablePacketSocket ? true , enablePacketSocket ? true
, enableViewer ? true , enableViewer ? true
@ -23,11 +23,7 @@ let
(pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0") (pkg: pkg != null && lib.versionAtLeast (lib.getVersion pkg) "1.0")
[ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
in in
assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ];
assert enableViewer -> enableGstPlugin; assert enableViewer -> enableGstPlugin;
assert enableViewer -> libnotify != null;
assert enableViewer -> gnome != null;
assert enableViewer -> gtk3 != null;
assert enableViewer -> gstreamerAtLeastVersion1; assert enableViewer -> gstreamerAtLeastVersion1;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -87,4 +83,3 @@ in
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }