diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-03-22 23:56:59 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-03-23 00:03:33 +0300 |
| commit | 3a948e6b07707c93e3cbf57e8679d89ade2546a5 (patch) | |
| tree | 2b33761ad1b586ca7a67d02502d67a622fb41b88 | |
| parent | 5a04d38ca62119e4669d829a9f0c0adfd1e77902 (diff) | |
| download | nixpkgs-3a948e6b07707c93e3cbf57e8679d89ade2546a5.tar nixpkgs-3a948e6b07707c93e3cbf57e8679d89ade2546a5.tar.gz nixpkgs-3a948e6b07707c93e3cbf57e8679d89ade2546a5.tar.bz2 nixpkgs-3a948e6b07707c93e3cbf57e8679d89ade2546a5.tar.lz nixpkgs-3a948e6b07707c93e3cbf57e8679d89ade2546a5.tar.xz nixpkgs-3a948e6b07707c93e3cbf57e8679d89ade2546a5.tar.zst nixpkgs-3a948e6b07707c93e3cbf57e8679d89ade2546a5.zip | |
qt5.qtwebengine: add proprietary codecs support
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix | 14 |
2 files changed, 12 insertions, 16 deletions
diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix index 3966840c5d2..7cdb957b2ab 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix @@ -11,8 +11,9 @@ , bison, flex, git, which, gperf , coreutils , pkgconfig, python2 +, enableProprietaryCodecs ? true -, stdenv # lib.optional, needsPax +, lib, stdenv # lib.optional, needsPax }: qtSubmodule { @@ -48,13 +49,10 @@ qtSubmodule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ 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 = [ dbus zlib alsaLib @@ -71,7 +69,7 @@ qtSubmodule { libcap pciutils ]; - patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; postInstall = '' cat > $out/libexec/qt.conf <<EOF [Paths] diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix index 410b6847e3d..dec3c36c7e0 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix @@ -11,8 +11,9 @@ , bison, flex, git, which, gperf , coreutils , pkgconfig, python2 +, enableProprietaryCodecs ? true -, stdenv # lib.optional, needsPax +, lib, stdenv # lib.optional, needsPax }: qtSubmodule { @@ -48,13 +49,10 @@ qtSubmodule { sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ 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 = [ dbus zlib alsaLib @@ -71,7 +69,7 @@ qtSubmodule { libcap pciutils ]; - patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; postInstall = '' cat > $out/libexec/qt.conf <<EOF [Paths] |