treewide: fix lints

Arg to lib.optional is a list

build time tool in buildInputs

10 files changed, 20 insertions, 20 deletions

diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix
index c9e1bed1db25b..5697e5986c114 100644
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
     Cocoa SystemConfiguration
   ] ++ lib.optionals coreaudioSupport [
     CoreAudio
-  ] ++ lib.optional sndioSupport [
+  ] ++ lib.optionals sndioSupport [
     sndio
-  ] ++ lib.optional pipewireSupport [
+  ] ++ lib.optionals pipewireSupport [
     pipewire
   ];
 
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     "-DDISABLE_STRIP=true"
   ];
 
-  postFixup = lib.optionals stdenv.isDarwin ''
+  postFixup = lib.optionalString stdenv.isDarwin ''
     install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}
     install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d
   '';
diff --git a/pkgs/applications/editors/l3afpad/default.nix b/pkgs/applications/editors/l3afpad/default.nix
index e047aaa270289..2ccea6afc3ee2 100644
--- a/pkgs/applications/editors/l3afpad/default.nix
+++ b/pkgs/applications/editors/l3afpad/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ly2w9jmRlprm/PnyC0LYjrxBVK+J0DLiSpzuTUMZpWA=";
   };
 
-  nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
-  buildInputs = [ intltool gtk3 ];
+  nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook intltool ];
+  buildInputs = [ gtk3 ];
 
   meta = with lib; {
     description = "Simple text editor forked from Leafpad using GTK+ 3.x";
diff --git a/pkgs/applications/emulators/c64-debugger/default.nix b/pkgs/applications/emulators/c64-debugger/default.nix
index b7c357ca2709a..fcd3a0aa9b527 100644
--- a/pkgs/applications/emulators/c64-debugger/default.nix
+++ b/pkgs/applications/emulators/c64-debugger/default.nix
@@ -26,13 +26,13 @@ stdenv.mkDerivation {
     gtk3
     libGL
     libGLU
-    pkg-config
     libX11
     xcbutil
   ];
 
   nativeBuildInputs = [
     upx
+    pkg-config
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/file-managers/lf/ctpv.nix b/pkgs/applications/file-managers/lf/ctpv.nix
index 7f5e2a6e089e3..36a01078831af 100644
--- a/pkgs/applications/file-managers/lf/ctpv.nix
+++ b/pkgs/applications/file-managers/lf/ctpv.nix
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = with pkgs; [
     ffmpegthumbnailer ffmpeg
-  ] ++ lib.optional waylandSupport [ chafa ]
-    ++ lib.optional x11Support [ ueberzug ];
+  ] ++ lib.optionals waylandSupport [ chafa ]
+    ++ lib.optionals x11Support [ ueberzug ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/applications/misc/citations/default.nix b/pkgs/applications/misc/citations/default.nix
index 928978ef47f4f..8e324595593f4 100644
--- a/pkgs/applications/misc/citations/default.nix
+++ b/pkgs/applications/misc/citations/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtksourceview5
     libadwaita
     poppler
-  ] ++ lib.optional stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Foundation
   ];
 
diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix
index 89179b88a8a00..533e05264bc82 100644
--- a/pkgs/applications/misc/mediaelch/default.nix
+++ b/pkgs/applications/misc/mediaelch/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     qtsvg
     qtwayland
     quazip
-  ] ++ lib.optional (qtVersion == "6") [
+  ] ++ lib.optionals (qtVersion == "6") [
     qt5compat
   ];
 
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index e4730e1869f81..1634c72b27b71 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
     # "Illegal instruction (core dumped)"
     gtk3
     gtk4
-  ] ++ lib.optional proprietaryCodecs [
+  ] ++ lib.optionals proprietaryCodecs [
     vivaldi-ffmpeg-codecs
   ];
 
diff --git a/pkgs/applications/networking/instant-messengers/nchat/default.nix b/pkgs/applications/networking/instant-messengers/nchat/default.nix
index 43d2d7e374555..4fe0cc054b7ed 100644
--- a/pkgs/applications/networking/instant-messengers/nchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nchat/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     readline
     sqlite
     zlib
-  ] ++ lib.optional stdenv.isDarwin [ AppKit Cocoa Foundation ];
+  ] ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Foundation ];
 
   cmakeFlags = [
     "-DHAS_WHATSAPP=OFF" # go module build required
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 115def63a3097..5b08fbfd6704c 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -31,10 +31,10 @@ stdenv.mkDerivation rec {
     bison
     flex
     git
-  ] ++ lib.optional useCore [ perl gsl ]
-  ++ lib.optional stdenv.isDarwin [ xcbuild ];
+  ] ++ lib.optionals useCore [ perl gsl ]
+  ++ lib.optionals stdenv.isDarwin [ xcbuild ];
 
-  buildInputs = lib.optional useIv [
+  buildInputs = lib.optionals useIv [
     xorg.libX11.dev
     xorg.libXcomposite.dev
     xorg.libXext.dev
@@ -47,11 +47,11 @@ stdenv.mkDerivation rec {
     python3.pkgs.setuptools
     python3.pkgs.scikit-build
     python3.pkgs.matplotlib
-  ] ++ lib.optional useMpi [
+  ] ++ lib.optionals useMpi [
     mpi
-  ] ++ lib.optional useMpi [
+  ] ++ lib.optionals useMpi [
     python3.pkgs.mpi4py
-  ] ++ lib.optional useRx3d [
+  ] ++ lib.optionals useRx3d [
     python3.pkgs.cython
     python3.pkgs.numpy
   ];
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 56d68fcd474be..cccb5680042dc 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -79,9 +79,9 @@ mkDerivation rec {
     python3Packages.mutagen
     xapian
     zlib
-  ] ++ lib.optional withGui [
+  ] ++ lib.optionals withGui [
     qtbase
-  ] ++ lib.optional stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     libiconv
   ];