pyrox.dev
Merge pull request #229149 from nrdxp/qutebrowser-improve
qutebrowser: vulkan support, et al.
authored by
Timothy DeHerrera
and committed by
GitHub
8fa4bf50
a87dad12
+13
-17
pkgs/applications/networking/browsers/qutebrowser/default.nix
+13
-17
pkgs/applications/networking/browsers/qutebrowser/default.nix
···
1
1
{ stdenv, lib, fetchurl, fetchzip, python3
2
2
, wrapQtAppsHook, glib-networking
3
3
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
4
-
, libxslt, gst_all_1 ? null
4
+
, libxslt
5
5
, withPdfReader ? true
6
-
, withMediaPlayback ? true
7
-
, backend ? "webengine"
8
6
, pipewireSupport ? stdenv.isLinux
9
7
, pipewire
10
8
, qtwayland
11
9
, qtbase
12
10
, qtwebengine
13
-
, wrapGAppsHook
14
11
, enableWideVine ? false
15
12
, widevine-cdm
13
+
, enableVulkan ? stdenv.isLinux
14
+
, vulkan-loader
16
15
}:
17
16
18
17
let
···
29
28
version = "3.0.2";
30
29
in
31
30
32
-
assert withMediaPlayback -> gst_all_1 != null;
33
-
assert lib.assertMsg (backend != "webkit") ''
34
-
Support for the QtWebKit backend has been removed.
35
-
Please remove the `backend = "webkit"` option from your qutebrowser override.
36
-
'';
37
-
38
31
python3.pkgs.buildPythonApplication {
39
32
inherit pname version;
40
33
src = fetchurl {
···
48
41
buildInputs = [
49
42
qtbase
50
43
glib-networking
51
-
] ++ lib.optionals withMediaPlayback (with gst_all_1; [
52
-
gst-plugins-base gst-plugins-good
53
-
gst-plugins-bad gst-plugins-ugly gst-libav
54
-
]);
44
+
];
55
45
56
46
nativeBuildInputs = [
57
-
wrapQtAppsHook wrapGAppsHook asciidoc
47
+
wrapQtAppsHook asciidoc
58
48
docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
59
49
python3.pkgs.pygments
60
50
];
···
74
64
./fix-restart.patch
75
65
];
76
66
77
-
dontWrapGApps = true;
78
67
dontWrapQtApps = true;
79
68
80
69
postPatch = ''
···
112
101
in
113
102
''
114
103
makeWrapperArgs+=(
115
-
"''${gappsWrapperArgs[@]}"
104
+
# Force the app to use QT_PLUGIN_PATH values from wrapper
105
+
--unset QT_PLUGIN_PATH
116
106
"''${qtWrapperArgs[@]}"
107
+
# avoid persistant warning on starup
108
+
--set QT_STYLE_OVERRIDE Fusion
117
109
${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''}
110
+
${lib.optionalString (enableVulkan) ''
111
+
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]}
112
+
--set-default QSG_RHI_BACKEND vulkan
113
+
''}
118
114
${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''}
119
115
)
120
116
'';