pyrox.dev
Merge master into staging-next
authored by github-actions[bot] and committed by GitHub 2b12bace 6b15fdce
+9
-5
pkgs/applications/networking/browsers/qutebrowser/default.nix
+9
-5
pkgs/applications/networking/browsers/qutebrowser/default.nix
···
1
-
{ lib, fetchurl, fetchzip, python3
2
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking
3
-
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
4
, libxslt, gst_all_1 ? null
5
, withPdfReader ? true
6
, withMediaPlayback ? true
···
31
32
in mkDerivationWith python3Packages.buildPythonApplication rec {
33
pname = "qutebrowser";
34
-
version = "2.2.1";
35
36
# the release tarballs are different from the git checkout!
37
src = fetchurl {
38
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
39
-
sha256 = "sha256-JHymxnNPdMsVma3TUKCS+iRCe9J7I0A6iISP5OXtJm8=";
40
};
41
42
# Needs tox
···
112
done
113
'';
114
115
-
preFixup = ''
116
makeWrapperArgs+=(
117
"''${gappsWrapperArgs[@]}"
118
"''${qtWrapperArgs[@]}"
119
--add-flags '--backend ${backend}'
120
--set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}"
121
)
122
'';
123
···
1
+
{ stdenv, lib, fetchurl, fetchzip, python3
2
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking
3
+
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, pipewire_0_2
4
, libxslt, gst_all_1 ? null
5
, withPdfReader ? true
6
, withMediaPlayback ? true
···
31
32
in mkDerivationWith python3Packages.buildPythonApplication rec {
33
pname = "qutebrowser";
34
+
version = "2.2.2";
35
36
# the release tarballs are different from the git checkout!
37
src = fetchurl {
38
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
39
+
sha256 = "11vjp20gzmdjj09b7wxzn7ar6viih0bk76y618yqsyqqkffylmbq";
40
};
41
42
# Needs tox
···
112
done
113
'';
114
115
+
preFixup = let
116
+
libPath = lib.makeLibraryPath [ pipewire_0_2 ];
117
+
in
118
+
''
119
makeWrapperArgs+=(
120
"''${gappsWrapperArgs[@]}"
121
"''${qtWrapperArgs[@]}"
122
--add-flags '--backend ${backend}'
123
--set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}"
124
+
${lib.optionalString (!stdenv.isDarwin && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''}
125
)
126
'';
127
+5
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+5
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
···
12
, libcap
13
, pciutils
14
, systemd
15
, enableProprietaryCodecs ? true
16
, gn
17
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
···
133
'';
134
135
qmakeFlags = [ "--" "-system-ffmpeg" ]
136
++ optional enableProprietaryCodecs "-proprietary-codecs";
137
138
propagatedBuildInputs = [
···
165
# X11 libs
166
xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
167
xorg.libXcomposite xorg.libXdamage libdrm
168
]
169
170
# FIXME These dependencies shouldn't be needed but can't find a way
···
12
, libcap
13
, pciutils
14
, systemd
15
+
, pipewire_0_2
16
, enableProprietaryCodecs ? true
17
, gn
18
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
···
134
'';
135
136
qmakeFlags = [ "--" "-system-ffmpeg" ]
137
+
++ optional stdenv.isLinux "-webengine-webrtc-pipewire"
138
++ optional enableProprietaryCodecs "-proprietary-codecs";
139
140
propagatedBuildInputs = [
···
167
# X11 libs
168
xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
169
xorg.libXcomposite xorg.libXdamage libdrm
170
+
171
+
# Pipewire
172
+
pipewire_0_2
173
]
174
175
# FIXME These dependencies shouldn't be needed but can't find a way