diff options
Diffstat (limited to 'pkgs/applications/networking/browsers')
4 files changed, 25 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2c70978a496..a1110fa07a8 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -128,6 +128,7 @@ let patches = [ ./patches/widevine.patch + ./patches/glibc-2.24.patch (if versionOlder version "52.0.0.0" then ./patches/nix_plugin_paths_50.patch else ./patches/nix_plugin_paths_52.patch) diff --git a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch new file mode 100644 index 00000000000..10a04b7ec8d --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch @@ -0,0 +1,14 @@ +--- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200 ++++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200 +@@ -41,6 +41,11 @@ + #include <errno.h> + #include <sys/mman.h> + ++#if OS(LINUX) && defined(MADV_FREE) ++// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime ++#undef MADV_FREE ++#endif ++ + #ifndef MADV_FREE + #define MADV_FREE MADV_DONTNEED + #endif diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 503c52ac7ba..c9adde4f15b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -7,6 +7,7 @@ , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ , esteidfirefoxplugin +, vlc_npapi }: ## configurability of the wrapper itself @@ -45,6 +46,7 @@ let ++ lib.optional (cfg.enableBluejeans or false) bluejeans ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin + ++ lib.optional (cfg.enableVLC or false) vlc_npapi ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) ++ lib.optionals (cfg.enableQuakeLive or false) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 154a3a9e919..bb7e66a94be 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -41,9 +41,6 @@ buildPythonApplication rec { ''; postInstall = '' - mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath - makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser - install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" install -Dm644 qutebrowser.desktop \ "$out/share/applications/qutebrowser.desktop" @@ -56,6 +53,14 @@ buildPythonApplication rec { install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* ''; + postFixup = '' + wrapPythonPrograms + mv $out/bin/qutebrowser $out/bin/.qutebrowser-noqtpath + makeQtWrapper $out/bin/.qutebrowser-noqtpath $out/bin/qutebrowser + + sed -i 's/\.qutebrowser-wrapped/qutebrowser/g' $out/bin/..qutebrowser-wrapped-wrapped + ''; + meta = { homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; |