diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2023-02-07 00:00:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-07 00:00:32 +0100 |
| commit | e74dc4bf646e2e8fe863e2699be57072a9e6b1a0 (patch) | |
| tree | 7ce0380cf3575069f9f9d120aa3c5e9487fe6119 | |
| parent | bd8cca16e2c47acd15594e7607dc4aaf07fc2f89 (diff) | |
| parent | 06eb99ffa2a9933651b5116f888dec20a74b7b12 (diff) | |
| download | nixpkgs-e74dc4bf646e2e8fe863e2699be57072a9e6b1a0.tar nixpkgs-e74dc4bf646e2e8fe863e2699be57072a9e6b1a0.tar.gz nixpkgs-e74dc4bf646e2e8fe863e2699be57072a9e6b1a0.tar.bz2 nixpkgs-e74dc4bf646e2e8fe863e2699be57072a9e6b1a0.tar.lz nixpkgs-e74dc4bf646e2e8fe863e2699be57072a9e6b1a0.tar.xz nixpkgs-e74dc4bf646e2e8fe863e2699be57072a9e6b1a0.tar.zst nixpkgs-e74dc4bf646e2e8fe863e2699be57072a9e6b1a0.zip | |
Merge pull request #215011 from primeos/chromiumBeta
chromiumBeta: Fix the build
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index aea178a3afc..4a7048010c8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -34,6 +34,7 @@ , libva , libdrm, wayland, libxkbcommon # Ozone , curl +, libffi , libepoxy # postPatch: , glibc # gconv + locale @@ -151,7 +152,8 @@ let libepoxy ] ++ lib.optional systemdSupport systemd ++ lib.optionals cupsSupport [ libgcrypt cups ] - ++ lib.optional pulseSupport libpulseaudio; + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional (chromiumVersionAtLeast "110") libffi; patches = [ # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): @@ -299,6 +301,10 @@ let use_system_libwayland = true; # The default value is hardcoded instead of using pkg-config: system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; + } // lib.optionalAttrs (chromiumVersionAtLeast "110") { + # To fix the build as we don't provide libffi_pic.a + # (ld.lld: error: unable to find library -l:libffi_pic.a): + use_system_libffi = true; } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; |