mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-08 05:27:57 +03:00
buildMozillaMach: don't use lib.optional with a list
This commit is contained in:
parent
fff82404c8
commit
7aab14cef1
@ -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" ];
|
||||
})
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user