Merge pull request #215011 from primeos/chromiumBeta

chromiumBeta: Fix the build

authored by Michael Weiss and committed by GitHub e74dc4bf bd8cca16

+7 -1
+7 -1
pkgs/applications/networking/browsers/chromium/common.nix
··· 34 , libva 35 , libdrm, wayland, libxkbcommon # Ozone 36 , curl 37 , libepoxy 38 # postPatch: 39 , glibc # gconv + locale ··· 151 libepoxy 152 ] ++ lib.optional systemdSupport systemd 153 ++ lib.optionals cupsSupport [ libgcrypt cups ] 154 - ++ lib.optional pulseSupport libpulseaudio; 155 156 patches = [ 157 # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ··· 299 use_system_libwayland = true; 300 # The default value is hardcoded instead of using pkg-config: 301 system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; 302 } // lib.optionalAttrs proprietaryCodecs { 303 # enable support for the H.264 codec 304 proprietary_codecs = true;
··· 34 , libva 35 , libdrm, wayland, libxkbcommon # Ozone 36 , curl 37 + , libffi 38 , libepoxy 39 # postPatch: 40 , glibc # gconv + locale ··· 152 libepoxy 153 ] ++ lib.optional systemdSupport systemd 154 ++ lib.optionals cupsSupport [ libgcrypt cups ] 155 + ++ lib.optional pulseSupport libpulseaudio 156 + ++ lib.optional (chromiumVersionAtLeast "110") libffi; 157 158 patches = [ 159 # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ··· 301 use_system_libwayland = true; 302 # The default value is hardcoded instead of using pkg-config: 303 system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; 304 + } // lib.optionalAttrs (chromiumVersionAtLeast "110") { 305 + # To fix the build as we don't provide libffi_pic.a 306 + # (ld.lld: error: unable to find library -l:libffi_pic.a): 307 + use_system_libffi = true; 308 } // lib.optionalAttrs proprietaryCodecs { 309 # enable support for the H.264 codec 310 proprietary_codecs = true;