tjh.dev
+3
-3
pkgs/applications/networking/browsers/chromium/common.nix
+3
-3
pkgs/applications/networking/browsers/chromium/common.nix
···
80
80
# "ffmpeg" # https://crbug.com/731766
81
81
# "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
82
82
# so we can't build with one from system and other from source
83
-
] ++ optional (upstream-info.channel != "dev") "yasm";
83
+
] ++ optional (versionRange "0" "84") "yasm";
84
84
85
85
opusWithCustomModes = libopus.override {
86
86
withCustomModes = true;
···
95
95
ffmpeg libxslt libxml2
96
96
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together
97
97
# so we can't build with one from system and other from source
98
-
] ++ (if upstream-info.channel == "dev" then [ nasm ] else [ yasm ]);
98
+
] ++ (if (versionRange "0" "84") then [ yasm ] else [ nasm ]);
99
99
100
100
# build paths and release info
101
101
packageName = extraAttrs.packageName or extraAttrs.name;
···
226
226
ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
227
227
'';
228
228
229
-
gnFlags = mkGnFlags (optionalAttrs (upstream-info.channel != "dev") {
229
+
gnFlags = mkGnFlags (optionalAttrs (versionRange "0" "84") {
230
230
linux_use_bundled_binutils = false;
231
231
} // {
232
232
use_lld = false;