diff options
| author | Felix Buehler <account@buehler.rocks> | 2023-02-06 21:49:02 +0100 |
|---|---|---|
| committer | Felix Buehler <account@buehler.rocks> | 2023-02-13 21:52:34 +0100 |
| commit | cdb39a86e0dd7cda3a057f4f4795485a5c9b9be5 (patch) | |
| tree | 1fef6e55f39dab2289b68b68972ee4c9b89520f7 /pkgs/stdenv | |
| parent | 7f610b4d3f6e6f695b1f5521862066c0ece79a5a (diff) | |
treewide: use optionalString
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 9d99be2a02039..dd7825a409e21 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -242,7 +242,7 @@ let remediationMsg = (builtins.getAttr reason remediation) attrs; msg = if inHydra then "Warning while evaluating ${getName attrs}: «${reason}»: ${errormsg}" else "Package ${getName attrs} in ${pos_str meta} ${errormsg}, continuing anyway." - + (if remediationMsg != "" then "\n${remediationMsg}" else ""); + + (lib.optionalString (remediationMsg != "") "\n${remediationMsg}"); isEnabled = lib.findFirst (x: x == reason) null showWarnings; in if isEnabled != null then builtins.trace msg true else true; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 5c7dfcceec644..8781907382862 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -104,8 +104,8 @@ let '' export NIX_ENFORCE_PURITY="''${NIX_ENFORCE_PURITY-1}" export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}" - ${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""} - ${if system == "mipsel-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""} + ${lib.optionalString (system == "x86_64-linux") "NIX_LIB64_IN_SELF_RPATH=1"} + ${lib.optionalString (system == "mipsel-linux") "NIX_LIB32_IN_SELF_RPATH=1"} ''; |