diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-12-21 14:56:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 14:56:35 +0100 |
| commit | bb91678d901f52b8b286b9be39008f775ddb8da6 (patch) | |
| tree | dcc84716cce041f45a202e2cada1d4bd04cbcd03 | |
| parent | matrix-synapse: 0.33.9 -> 0.34.0 (diff) | |
| download | nixpkgs-origin/revert-50521-qt-cf-private.tar.gz | |
Revert "qt59.qtwebkit: fix build on Darwin"origin/revert-50521-qt-cf-private
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 526fc2b8b2d1..6b61359c8aaa 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -27,7 +27,7 @@ qtModule { ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia ++ optional (lib.versionAtLeast qtbase.version "5.11.0") qtwebchannel; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ] - ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private OpenGL ]) + ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ]) ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ]; nativeBuildInputs = [ bison2 flex gdb gperf perl pkgconfig python2 ruby |