From e97c0f628142aa18b0a7ab4d29cb954763f73880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 9 Nov 2021 10:20:26 +0100 Subject: [PATCH] sane: remove ? null from inputs, cleanup meta --- pkgs/applications/graphics/sane/xsane.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 8febb819bb3b..007483fb5e26 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -7,13 +7,11 @@ , gtk2 , pkg-config , libpng -, libusb-compat-0_1 ? null +, libusb-compat-0_1 , gimpSupport ? false -, gimp ? null +, gimp }: -assert gimpSupport -> gimp != null; - stdenv.mkDerivation rec { pname = "xsane"; version = "0.999"; @@ -29,14 +27,15 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpng sane-backends sane-frontends libX11 gtk2 ] - ++ (if libusb-compat-0_1 != null then [ libusb-compat-0_1 ] else [ ]) + + buildInputs = [ libpng libusb-compat-0_1 sane-backends sane-frontends libX11 gtk2 ] ++ lib.optional gimpSupport gimp; - meta = { + meta = with lib; { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; - license = lib.licenses.gpl2Plus; - platforms = with lib.platforms; linux; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ]; }; }