diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-03-22 19:10:15 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-03-23 00:00:50 +0300 |
| commit | a7a858aa52636971ea03164020104d295a72e4ce (patch) | |
| tree | f11dc4da8d78db520acfcc707e56514172e18be2 /pkgs | |
| parent | 8c410f4b1877d3de7be5255972ef8177cdb81b9a (diff) | |
| download | nixpkgs-a7a858aa52636971ea03164020104d295a72e4ce.tar nixpkgs-a7a858aa52636971ea03164020104d295a72e4ce.tar.gz nixpkgs-a7a858aa52636971ea03164020104d295a72e4ce.tar.bz2 nixpkgs-a7a858aa52636971ea03164020104d295a72e4ce.tar.lz nixpkgs-a7a858aa52636971ea03164020104d295a72e4ce.tar.xz nixpkgs-a7a858aa52636971ea03164020104d295a72e4ce.tar.zst nixpkgs-a7a858aa52636971ea03164020104d295a72e4ce.zip | |
qt5.qtwebengine: patch more library paths
Adapted from chromium derivation. Fixes qutebrowser crash.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix | 7 |
2 files changed, 14 insertions, 0 deletions
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 a42dda1b36c..3966840c5d2 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 7b6660bf766..410b6847e3d 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 \ |