swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-06 18:26:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-05-21 06:22:09 +00:00 committed by GitHub
parent 6b15fdce86 eb20269353
commit 2b12bace86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/networking/browsers/qutebrowser/default.nix
View file

@ -1,6 +1,6 @@
{ lib, fetchurl, fetchzip, python3 { stdenv, lib, fetchurl, fetchzip, python3
, mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking , mkDerivationWith, wrapQtAppsHook, wrapGAppsHook, qtbase, qtwebengine, glib-networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, pipewire_0_2
, libxslt, gst_all_1 ? null , libxslt, gst_all_1 ? null
, withPdfReader ? true , withPdfReader ? true
, withMediaPlayback ? true , withMediaPlayback ? true
@ -31,12 +31,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec { in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser"; pname = "qutebrowser";
version = "2.2.1"; version = "2.2.2";
# the release tarballs are different from the git checkout! # the release tarballs are different from the git checkout!
src = fetchurl { src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
sha256 = "sha256-JHymxnNPdMsVma3TUKCS+iRCe9J7I0A6iISP5OXtJm8="; sha256 = "11vjp20gzmdjj09b7wxzn7ar6viih0bk76y618yqsyqqkffylmbq";
}; };
# Needs tox # Needs tox
@ -112,12 +112,16 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
done done
''; '';
preFixup = '' preFixup = let
libPath = lib.makeLibraryPath [ pipewire_0_2 ];
in
''
makeWrapperArgs+=( makeWrapperArgs+=(
"''${gappsWrapperArgs[@]}" "''${gappsWrapperArgs[@]}"
"''${qtWrapperArgs[@]}" "''${qtWrapperArgs[@]}"
--add-flags '--backend ${backend}' --add-flags '--backend ${backend}'
--set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}" --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}"
${lib.optionalString (!stdenv.isDarwin && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''}
) )
''; '';

5
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View file

@ -12,6 +12,7 @@
, libcap , libcap
, pciutils , pciutils
, systemd , systemd
, pipewire_0_2
, enableProprietaryCodecs ? true , enableProprietaryCodecs ? true
, gn , gn
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
@ -133,6 +134,7 @@ qtModule {
''; '';
qmakeFlags = [ "--" "-system-ffmpeg" ] qmakeFlags = [ "--" "-system-ffmpeg" ]
++ optional stdenv.isLinux "-webengine-webrtc-pipewire"
++ optional enableProprietaryCodecs "-proprietary-codecs"; ++ optional enableProprietaryCodecs "-proprietary-codecs";
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -165,6 +167,9 @@ qtModule {
# X11 libs # X11 libs
xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
xorg.libXcomposite xorg.libXdamage libdrm xorg.libXcomposite xorg.libXdamage libdrm
# Pipewire
pipewire_0_2
] ]
# FIXME These dependencies shouldn't be needed but can't find a way # FIXME These dependencies shouldn't be needed but can't find a way