Merge pull request #140493 from figsoda/lib-optional-list

treewide: avoid use of lib.optional with list in inputs

figsoda b995290d 2ba20b20

Changed files
+7 -7
pkgs
applications
science
biology
development
compilers
graalvm
libraries
pangomm
qt-5
modules
tools
misc
kak-lsp
nix
nixdoc
text
kakasi
+1 -1
pkgs/applications/science/biology/ants/default.nix
···
];
nativeBuildInputs = [ cmake makeWrapper ];
-
buildInputs = [ itk4 vtk_7 ] ++ lib.optional stdenv.isDarwin [ Cocoa ];
+
buildInputs = [ itk4 vtk_7 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
+1 -1
pkgs/development/compilers/graalvm/default.nix
···
rev = "jvmci-${version}";
sha256 = "0j7my76vldbrvki9x1gn9ics3x2z96j05jdy4nflbpik8i396114";
};
-
buildInputs = [ mx mercurial openjdk ] ++ lib.optional stdenv.isDarwin [
+
buildInputs = [ mx mercurial openjdk ] ++ lib.optionals stdenv.isDarwin [
libobjc CoreFoundation Foundation JavaNativeFoundation JavaRuntimeSupport JavaVM xcodebuild Cocoa
];
postUnpack = ''
+1 -1
pkgs/development/libraries/pangomm/default.nix
···
outputs = [ "out" "dev" ];
-
nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optional stdenv.isDarwin [
+
nativeBuildInputs = [ pkg-config meson ninja python3 ] ++ lib.optionals stdenv.isDarwin [
ApplicationServices
];
propagatedBuildInputs = [ pango glibmm cairomm ];
+1 -1
pkgs/development/libraries/qt-5/modules/qtwebview.nix
···
qtModule {
pname = "qtwebview";
qtInputs = [ qtdeclarative qtwebengine ];
-
buildInputs = lib.optional stdenv.isDarwin [
+
buildInputs = lib.optionals stdenv.isDarwin [
CoreFoundation
WebKit
];
+1 -1
pkgs/tools/misc/kak-lsp/default.nix
···
cargoSha256 = "0sv1a2k5rcf4hl1w50mh041r3w3nir6avyl6xa3rlcc7cy19q21y";
-
buildInputs = lib.optional stdenv.isDarwin [ Security ];
+
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Kakoune Language Server Protocol Client";
+1 -1
pkgs/tools/nix/nixdoc/default.nix
···
sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s";
};
-
buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ];
+
buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ];
cargoSha256 = "1nv6g8rmjjbwqmjkrpqncypqvx5c7xp2zlx5h6rw2j9d1wlys0v5";
+1 -1
pkgs/tools/text/kakasi/default.nix
···
pname = "kakasi";
version = "2.3.6";
-
buildInputs = lib.optional stdenv.isDarwin [ libiconv ];
+
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
meta = with lib; {
description = "Kanji Kana Simple Inverter";