From 2a385516516c5d1762e1d33c96e3fd25c457ca96 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 5 Mar 2017 17:05:33 -0600 Subject: [PATCH] qtwebengine: update build system paths for Qt 5.8 --- pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix | 4 ++-- .../qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix index ec3f9061f795f0..9d63f848cba8fc 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix @@ -27,9 +27,9 @@ qtSubmodule { export MAKEFLAGS=-j$NIX_BUILD_CORES substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/build/toolchain.gypi \ + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \ + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ --replace /bin/echo ${coreutils}/bin/echo # fix default SSL bundle location diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch index b3316188f7d9f8..49d4c4f042b601 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch +++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch @@ -1,5 +1,5 @@ ---- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-03-04 01:48:36.000000000 +1100 -+++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 2016-05-01 19:15:44.052770543 +1000 +--- qtwebengine-opensource-src-5.8.0-orig/src/3rdparty/chromium/v8/src/v8.gyp 2016-03-04 01:48:36.000000000 +1100 ++++ qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/v8/src/v8.gyp 2016-05-01 19:15:44.052770543 +1000 @@ -33,6 +33,7 @@ 'embed_script%': "", 'v8_extra_library_files%': [],