diff options
| author | Artturin <Artturin@artturin.com> | 2022-10-06 19:38:53 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-10-10 15:40:21 +0300 |
| commit | 7e49471316373c471a3bf4b78c130ebc907ae2d2 (patch) | |
| tree | 73e4fd3e290d0a79934d2b9273c1b5b51c8af8f1 /pkgs/os-specific/linux | |
| parent | f4ea1208ec732d423a784bbb2b882f997b6af902 (diff) | |
| download | nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.gz nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.bz2 nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.lz nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.xz nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.tar.zst nixpkgs-7e49471316373c471a3bf4b78c130ebc907ae2d2.zip | |
treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/exfat/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel-headers/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/rtl8812au/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index d459d240844..ee6f448112d 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "ARCH=${stdenv.hostPlatform.linuxArch}" - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 7e148b9145c..ebf20a015c0 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -27,7 +27,7 @@ let flex bison python rsync ]; - extraIncludeDirs = lib.optional (with stdenvNoCC.hostPlatform; isPower && is32bit && isBigEndian) ["ppc"]; + extraIncludeDirs = lib.optionals (with stdenvNoCC.hostPlatform; isPower && is32bit && isBigEndian) ["ppc"]; inherit patches; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 351d71ab8e2..ea9dbcabd0e 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -101,7 +101,7 @@ let nativeBuildInputs = [ perl nukeReferences ] ++ optionals (!libsOnly) kernel.moduleBuildDependencies; - disallowedReferences = optional (!libsOnly) [ kernel.dev ]; + disallowedReferences = optionals (!libsOnly) [ kernel.dev ]; passthru = { open = mapNullable (hash: callPackage ./open.nix { diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 03a5c0f4aeb..6a1c4fc80da 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if stdenv.hostPlatform.isx86 then "y" else "n")) ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n")) - ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; |