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/misc | |
| parent | 7f610b4d3f6e6f695b1f5521862066c0ece79a5a (diff) | |
treewide: use optionalString
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/cups/drivers/samsung/4.01.17.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/source-and-tags/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 3347030174783..eaba99839f61b 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -23,7 +23,7 @@ # to see what will break when upgrading. Consider a new versioned attribute. let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; - appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; + appendPath = lib.optionalString (stdenv.hostPlatform.system == "x86_64-linux") "64"; libPath = lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 966a451c060c4..88ed7a4772514 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/pkgs/misc/source-and-tags/default.nix @@ -59,7 +59,7 @@ # without this creating tag files for lifted-base fails export LC_ALL=en_US.UTF-8 export LANG=en_US.UTF-8 - ${if stdenv.isLinux then "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;" else ""} + ${lib.optionalString stdenv.isLinux "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;"} ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags . mv tags \$TAG_FILE |