swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 13:29:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtwebengine: fix build with pulseaudio 13.0

Browse source
This commit is contained in:
worldofpeace 2019-09-14 13:18:48 -04:00
parent 5d49ee3e5d
commit dcdee6db60
4 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/qt-5/5.11/default.nix
View file

@ -69,6 +69,13 @@ let
qtwebengine = [
./qtwebengine-no-build-skip.patch
./qtwebengine-darwin-no-platform-check.patch
# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707
# https://bugreports.qt.io/browse/QTBUG-77037
(fetchpatch {
name = "fix-build-with-pulseaudio-13.0.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
})
];
qtwebkit = [ ./qtwebkit.patch ];
};

9
pkgs/development/libraries/qt-5/5.12/default.nix
View file

@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.
{
newScope,
stdenv, fetchurl, fetchFromGitHub, makeSetupHook, makeWrapper,
stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper,
bison, cups ? null, harfbuzz, libGL, perl,
gstreamer, gst-plugins-base, gtk3, dconf,
llvmPackages_5,
@ -60,6 +60,13 @@ let
qtserialport = [ ./qtserialport.patch ];
qtwebengine = [
./qtwebengine-no-build-skip.patch
# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707
# https://bugreports.qt.io/browse/QTBUG-77037
(fetchpatch {
name = "fix-build-with-pulseaudio-13.0.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
})
]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ]

13
pkgs/development/libraries/qt-5/5.9/default.nix
View file

@ -53,9 +53,18 @@ let
];
qtserialport = [ ./qtserialport.patch ];
qttools = [ ./qttools.patch ];
qtwebengine = [ ./qtwebengine-no-build-skip.patch ]
++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
qtwebengine = [
./qtwebengine-no-build-skip.patch
# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707
# https://bugreports.qt.io/browse/QTBUG-77037
(fetchpatch {
name = "fix-build-with-pulseaudio-13.0.patch";
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
})
] ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ ./qtwebkit.patch ];
qtvirtualkeyboard = [
(fetchpatch {

2
pkgs/top-level/all-packages.nix
View file

@ -13207,7 +13207,7 @@ in
qt512 = recurseIntoAttrs (makeOverridable
(import ../development/libraries/qt-5/5.12) {
inherit newScope;
inherit stdenv fetchurl fetchFromGitHub makeSetupHook makeWrapper;
inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
bison = bison2; # error: too few arguments to function 'int yylex(...
inherit cups;
inherit harfbuzz;