diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2022-02-28 13:12:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 13:12:56 +0100 |
| commit | 12518d74f561bed65441ea633bc31fe85cb7e983 (patch) | |
| tree | ce08384cfaaf2584b0789eddf59de8035ee97985 /pkgs | |
| parent | 53e70ab75490df87a165d704a9e98312b3f5137b (diff) | |
| parent | 3bce8227a0019104590dfab07d527f7493a9e1f6 (diff) | |
Merge pull request #162202 from primeos/chromium
chromiumBeta: Fix the build
Diffstat (limited to 'pkgs')
3 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index c377c0ab2079b..0eb1893e95c0d 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -96,7 +96,7 @@ let "libpng" "libwebp" "libxslt" - "opus" + # "opus" ]; opusWithCustomModes = libopus.override { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 53762744504ed..084db58f38b72 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_13, llvmPackages_14, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -54,6 +54,9 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); + } // lib.optionalAttrs (chromiumVersionAtLeast "99") rec { + llvmPackages = llvmPackages_14; + stdenv = llvmPackages_14.stdenv; }); browser = callPackage ./browser.nix { diff --git a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch index 26ecef2564952..38fb965b472aa 100644 --- a/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch +++ b/pkgs/development/compilers/llvm/14/lld/fix-root-src-dir.patch @@ -1,13 +1,13 @@ -diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt -index e1a29b884d17..9d542f8fbfc1 100644 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bcc135665d0..d38679ed41e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -64,7 +64,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - - set(LLVM_MAIN_INCLUDE_DIR ${MAIN_INCLUDE_DIR} CACHE PATH "Path to llvm/include") - set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") -- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") +@@ -74,7 +74,7 @@ if(LLD_BUILT_STANDALONE) + + set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") + set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") +- set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") + set(LLVM_MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" CACHE PATH "Path to LLVM source tree") - + find_program(LLVM_TABLEGEN_EXE "llvm-tblgen" ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) |