diff options
| author | Felix Buehler <account@buehler.rocks> | 2023-02-14 19:11:59 +0100 |
|---|---|---|
| committer | Felix Buehler <account@buehler.rocks> | 2023-02-14 19:11:59 +0100 |
| commit | bc3d5934d7f276a21537b40159491257ee163d94 (patch) | |
| tree | 53b1d9bd9cb148a0ab34f2fd9e1d94802dde639e /pkgs/stdenv | |
| parent | 3bee4ab8db244db328b41ae5f4fbce19b658f1be (diff) | |
| download | nixlib-bc3d5934d7f276a21537b40159491257ee163d94.tar nixlib-bc3d5934d7f276a21537b40159491257ee163d94.tar.gz nixlib-bc3d5934d7f276a21537b40159491257ee163d94.tar.bz2 nixlib-bc3d5934d7f276a21537b40159491257ee163d94.tar.lz nixlib-bc3d5934d7f276a21537b40159491257ee163d94.tar.xz nixlib-bc3d5934d7f276a21537b40159491257ee163d94.tar.zst nixlib-bc3d5934d7f276a21537b40159491257ee163d94.zip | |
treewide: use lib.optionals
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/native/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index dd7825a409e2..4b0ca649ee94 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -322,7 +322,7 @@ let }" else "key 'meta.${k}' is unrecognized; expected one of: \n [${lib.concatMapStringsSep ", " (x: "'${x}'") (lib.attrNames metaTypes)}]"; - checkMeta = meta: if config.checkMeta then lib.remove null (lib.mapAttrsToList checkMetaAttr meta) else []; + checkMeta = meta: lib.optionals config.checkMeta (lib.remove null (lib.mapAttrsToList checkMetaAttr meta)); checkOutputsToInstall = attrs: let expectedOutputs = attrs.meta.outputsToInstall or []; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 87862b84bc1b..bae4ff2c93b2 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -12,9 +12,9 @@ let else "/bin/bash"; path = - (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++ - (if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++ - (if system == "x86_64-solaris" then [ "/opt/local/gnu" ] else []) ++ + (lib.optionals (system == "i686-solaris") [ "/usr/gnu" ]) ++ + (lib.optionals (system == "i686-netbsd") [ "/usr/pkg" ]) ++ + (lib.optionals (system == "x86_64-solaris") [ "/opt/local/gnu" ]) ++ ["/" "/usr" "/usr/local"]; prehookBase = '' |