public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5.qtwebengine: add proprietary codecs support

This commit is contained in:
Nikolay Amiantov 2017-03-22 23:56:59 +03:00
parent 5a04d38ca6
commit 3a948e6b07
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
View File

@ -11,8 +11,9 @@
, bison, flex, git, which, gperf , bison, flex, git, which, gperf
, coreutils , coreutils
, pkgconfig, python2 , pkgconfig, python2
, enableProprietaryCodecs ? true
, stdenv # lib.optional, needsPax , lib, stdenv # lib.optional, needsPax
}: }:
qtSubmodule { qtSubmodule {
@ -48,13 +49,10 @@ qtSubmodule {
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
configureFlags+="\
-plugindir $out/lib/qt5/plugins \
-importdir $out/lib/qt5/imports \
-qmldir $out/lib/qt5/qml \
-docdir $out/share/doc/qt5"
''; '';
qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
propagatedBuildInputs = [ propagatedBuildInputs = [
dbus zlib alsaLib dbus zlib alsaLib
@ -71,7 +69,7 @@ qtSubmodule {
libcap libcap
pciutils pciutils
]; ];
patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
postInstall = '' postInstall = ''
cat > $out/libexec/qt.conf <<EOF cat > $out/libexec/qt.conf <<EOF
[Paths] [Paths]

14
pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
View File

@ -11,8 +11,9 @@
, bison, flex, git, which, gperf , bison, flex, git, which, gperf
, coreutils , coreutils
, pkgconfig, python2 , pkgconfig, python2
, enableProprietaryCodecs ? true
, stdenv # lib.optional, needsPax , lib, stdenv # lib.optional, needsPax
}: }:
qtSubmodule { qtSubmodule {
@ -48,13 +49,10 @@ qtSubmodule {
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
configureFlags+="\
-plugindir $out/lib/qt5/plugins \
-importdir $out/lib/qt5/imports \
-qmldir $out/lib/qt5/qml \
-docdir $out/share/doc/qt5"
''; '';
qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
propagatedBuildInputs = [ propagatedBuildInputs = [
dbus zlib alsaLib dbus zlib alsaLib
@ -71,7 +69,7 @@ qtSubmodule {
libcap libcap
pciutils pciutils
]; ];
patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
postInstall = '' postInstall = ''
cat > $out/libexec/qt.conf <<EOF cat > $out/libexec/qt.conf <<EOF
[Paths] [Paths]