diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-06-23 01:45:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 01:45:30 +0200 |
| commit | 3cb61223dfefbbb35b3bcef6950df603298511e2 (patch) | |
| tree | 5679bb9ba340753c8e3c4c3fee0fad2f8ff5cfeb | |
| parent | 65e7b4e35049ff04e33967f4b96ef520d3d0eadc (diff) | |
| parent | 08b159c92d9146323dd43c8f695ac956f211743a (diff) | |
| download | nixpkgs-3cb61223dfefbbb35b3bcef6950df603298511e2.tar nixpkgs-3cb61223dfefbbb35b3bcef6950df603298511e2.tar.gz nixpkgs-3cb61223dfefbbb35b3bcef6950df603298511e2.tar.bz2 nixpkgs-3cb61223dfefbbb35b3bcef6950df603298511e2.tar.lz nixpkgs-3cb61223dfefbbb35b3bcef6950df603298511e2.tar.xz nixpkgs-3cb61223dfefbbb35b3bcef6950df603298511e2.tar.zst nixpkgs-3cb61223dfefbbb35b3bcef6950df603298511e2.zip | |
Merge pull request #239262 from figsoda/optionals
treewide: don't use lib.optional with a list
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/terminal-emulators/rio/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index a062d767d13..3224f31df36 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -205,7 +205,7 @@ let in -buildStdenv.mkDerivation ({ +buildStdenv.mkDerivation { pname = "${pname}-unwrapped"; inherit version; @@ -239,14 +239,14 @@ buildStdenv.mkDerivation ({ hash = "sha256-fLUYaJwhrC/wF24HkuWn2PHqz7LlAaIZ1HYjRDB2w9A="; }) ] - ++ lib.optional (lib.versionOlder version "109") [ + ++ lib.optionals (lib.versionOlder version "109") [ # cherry-pick bindgen change to fix build with clang 16 (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/community/firefox-esr/bindgen.patch?id=4c4b0c01c808657fffc5b796c56108c57301b28f"; hash = "sha256-lTvgT358M4M2vedZ+A6xSKsBYhSN+McdmEeR9t75MLU="; }) ] - ++ lib.optional (lib.versionOlder version "111") [ + ++ lib.optionals (lib.versionOlder version "111") [ # cherry-pick mp4parse change fixing build with Rust 1.70+ # original change: https://github.com/mozilla/mp4parse-rust/commit/8b5b652d38e007e736bb442ccd5aa5ed699db100 # vendored to update checksums @@ -590,4 +590,4 @@ buildStdenv.mkDerivation ({ dontUpdateAutotoolsGnuConfigScripts = true; requiredSystemFeatures = [ "big-parallel" ]; -}) +} diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 44ecdd23d3c..d72a43507a3 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -27,13 +27,13 @@ let fontconfig libGL vulkan-loader - ] ++ lib.optional withX11 [ + ] ++ lib.optionals withX11 [ libX11 libXcursor libXi libXrandr libxcb - ] ++ lib.optional withWayland [ + ] ++ lib.optionals withWayland [ wayland ]; in |