diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-11-21 17:38:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-21 17:38:10 +0000 |
| commit | 7f2c30f8512fa9b4a7cc067f74c6cabc4acc1a51 (patch) | |
| tree | 3de18597060194a817e7e80aa0ebff020f316584 /pkgs/development/libraries/qt-5 | |
| parent | 9959d7d8b8f35341e6aecd2d6b87a70e240edbc3 (diff) | |
| parent | 874468f23e21681bc6493f42b44bd620918e2f82 (diff) | |
| download | nixlib-7f2c30f8512fa9b4a7cc067f74c6cabc4acc1a51.tar nixlib-7f2c30f8512fa9b4a7cc067f74c6cabc4acc1a51.tar.gz nixlib-7f2c30f8512fa9b4a7cc067f74c6cabc4acc1a51.tar.bz2 nixlib-7f2c30f8512fa9b4a7cc067f74c6cabc4acc1a51.tar.lz nixlib-7f2c30f8512fa9b4a7cc067f74c6cabc4acc1a51.tar.xz nixlib-7f2c30f8512fa9b4a7cc067f74c6cabc4acc1a51.tar.zst nixlib-7f2c30f8512fa9b4a7cc067f74c6cabc4acc1a51.zip | |
Merge pull request #50521 from alyssais/qt-cf-private
qt59.qtwebkit: fix build on Darwin
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -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 6b61359c8aaa..526fc2b8b2d1 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.apple_sdk.frameworks; [ OpenGL ]) + ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ cf-private OpenGL ]) ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ]; nativeBuildInputs = [ bison2 flex gdb gperf perl pkgconfig python2 ruby |