From 7c29e476a76b691ca30cbbe07f75f589c11861e7 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 7 Dec 2016 13:12:47 -0600 Subject: [PATCH] qt5.6/5.7: PaX compat qtwebengine * paxmark QtWebEngineProcess so it executes on PaX kernels * when building on host w/PaX apply patch to fix mksnapshot Patch taken from Gentoo[1], slightly modified to use paxctl directly. [1] https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch --- .../qt-5/5.6/qtwebengine/default.nix | 6 ++- .../qtwebengine-paxmark-mksnapshot.patch | 46 +++++++++++++++++++ .../libraries/qt-5/5.7/default.nix | 2 +- .../default.nix} | 4 ++ .../qtwebengine-paxmark-mksnapshot.patch | 46 +++++++++++++++++++ 5 files changed, 102 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebengine/qtwebengine-paxmark-mksnapshot.patch rename pkgs/development/libraries/qt-5/5.7/{qtwebengine.nix => qtwebengine/default.nix} (90%) create mode 100644 pkgs/development/libraries/qt-5/5.7/qtwebengine/qtwebengine-paxmark-mksnapshot.patch diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix index 29a5349ecea..96b6cca75aa 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix @@ -11,6 +11,7 @@ , coreutils , pkgconfig, python2 +, stdenv # lib.optional, needsPax }: qtSubmodule { @@ -60,11 +61,14 @@ qtSubmodule { ]; patches = [ ./chromium-clang-update-py.patch - ]; + ] ++ stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + postInstall = '' cat > $out/libexec/qt.conf < $out/libexec/qt.conf <