nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 20:03:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
treewide: avoid use of lib.optional with list in inputs
This commit is contained in:
figsoda 2021-10-04 13:42:25 -04:00 committed by GitHub
commit b995290d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/science/biology/ants/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
];
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" ];

2
pkgs/development/compilers/graalvm/default.nix
View File

@ -287,7 +287,7 @@ in rec {
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 = ''

2
pkgs/development/libraries/pangomm/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
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 ];

2
pkgs/development/libraries/qt-5/modules/qtwebview.nix
View File

@ -3,7 +3,7 @@
qtModule {
pname = "qtwebview";
qtInputs = [ qtdeclarative qtwebengine ];
buildInputs = lib.optional stdenv.isDarwin [
buildInputs = lib.optionals stdenv.isDarwin [
CoreFoundation
WebKit
];

2
pkgs/tools/misc/kak-lsp/default.nix
View File

@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0sv1a2k5rcf4hl1w50mh041r3w3nir6avyl6xa3rlcc7cy19q21y";
buildInputs = lib.optional stdenv.isDarwin [ Security ];
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; {
description = "Kakoune Language Server Protocol Client";

2
pkgs/tools/nix/nixdoc/default.nix
View File

@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "14d4dq06jdqazxvv7fq5872zy0capxyb0fdkp8qg06gxl1iw201s";
};
buildInputs = lib.optional stdenv.isDarwin [ darwin.Security ];
buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ];
cargoSha256 = "1nv6g8rmjjbwqmjkrpqncypqvx5c7xp2zlx5h6rw2j9d1wlys0v5";

2
pkgs/tools/text/kakasi/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
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";