From a7a858aa52636971ea03164020104d295a72e4ce Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 22 Mar 2017 19:10:15 +0300 Subject: [PATCH] qt5.qtwebengine: patch more library paths Adapted from chromium derivation. Fixes qutebrowser crash. --- .../development/libraries/qt-5/5.7/qtwebengine/default.nix | 7 +++++++ .../development/libraries/qt-5/5.8/qtwebengine/default.nix | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix index a42dda1b36cb..3966840c5d26 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix @@ -6,6 +6,7 @@ , alsaLib , libcap , pciutils +, systemd , bison, flex, git, which, gperf , coreutils @@ -42,6 +43,12 @@ qtSubmodule { -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ src/core/web_engine_library_info.cpp + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + src/3rdparty/chromium/device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc + configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ 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 7b6660bf7668..410b6847e3dc 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix @@ -6,6 +6,7 @@ , alsaLib , libcap , pciutils +, systemd , bison, flex, git, which, gperf , coreutils @@ -42,6 +43,12 @@ qtSubmodule { -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ src/core/web_engine_library_info.cpp + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + src/3rdparty/chromium/device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc + configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \