diff options
author | Herwig Hochleitner <herwig@bendlas.net> | 2017-07-31 10:01:15 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-08-11 11:17:14 +0200 |
commit | bb397093b53b8f9f839adb9c0190ab5bd23ba677 (patch) | |
tree | 60e7d92cb73c0f9b2cf454b15aae692978e0767a /pkgs/applications/networking/browsers/chromium | |
parent | 8dc869e3400cb30bd8685128c038593a0e793b54 (diff) | |
download | nixpkgs-bb397093b53b8f9f839adb9c0190ab5bd23ba677.tar nixpkgs-bb397093b53b8f9f839adb9c0190ab5bd23ba677.tar.gz nixpkgs-bb397093b53b8f9f839adb9c0190ab5bd23ba677.tar.bz2 nixpkgs-bb397093b53b8f9f839adb9c0190ab5bd23ba677.tar.lz nixpkgs-bb397093b53b8f9f839adb9c0190ab5bd23ba677.tar.xz nixpkgs-bb397093b53b8f9f839adb9c0190ab5bd23ba677.tar.zst nixpkgs-bb397093b53b8f9f839adb9c0190ab5bd23ba677.zip |
chromium: add build flags and system libs
This is lifted from the Arch build recipe: https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/chromium using system libjpeg still doesn't work for some reason, otherwise the build runs fine
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 9 |
2 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b930ab79658..7802e1bf1b5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -60,7 +60,10 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "ffmpeg" "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "snappy" # "libpng" "libjpeg" + "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib" + # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* + # "re2" # fails with linker errors + # "ffmpeg" # https://crbug.com/731766 ]; opusWithCustomModes = libopus.override { @@ -73,7 +76,7 @@ let libpng libcap xdg_utils yasm minizip libwebp libusb1 re2 zlib - ffmpeg harfbuzz libxslt harfbuzz-icu libxml2 + ffmpeg harfbuzz-icu libxslt libxml2 ]; # build paths and release info @@ -182,9 +185,14 @@ let enable_hotwording = enableHotwording; enable_widevine = enableWideVine; use_cups = cupsSupport; - } // { + treat_warnings_as_errors = false; is_clang = false; + clang_use_chrome_plugins = false; + remove_webcore_debug_symbols = true; + use_gtk3 = true; + enable_swiftshader = false; + fieldtrial_testing_like_official_build = true; # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 30a16d824d0..7aa02e2c574 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, stdenv, makeWrapper, makeDesktopItem, ed -, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas +, glib, gtk3, gnome3, gsettings_desktop_schemas # package customization , channel ? "stable" @@ -67,9 +67,6 @@ let inherit (stdenv.lib) versionAtLeast; - gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; - gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; - in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -78,10 +75,10 @@ in stdenv.mkDerivation { makeWrapper ed # needed for GSETTINGS_SCHEMAS_PATH - gsettings_desktop_schemas glib gtk + gsettings_desktop_schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome.defaultIconTheme + gnome3.defaultIconTheme ]; outputs = ["out" "sandbox"]; |