diff options
| author | Pedro Pombeiro <pombeirp@users.noreply.github.com> | 2019-02-22 17:36:37 +0100 |
|---|---|---|
| committer | Pedro Pombeiro <pombeirp@users.noreply.github.com> | 2019-03-02 09:50:08 +0100 |
| commit | 080612a870a8137c509061a33b35916cd2bc6eac (patch) | |
| tree | 69de911ea51a7ebf809d2942d0b56cc260ad3fc4 | |
| parent | 81bf897e294a27b59b73f6a76942b1405923e99e (diff) | |
| download | nixlib-080612a870a8137c509061a33b35916cd2bc6eac.tar nixlib-080612a870a8137c509061a33b35916cd2bc6eac.tar.gz nixlib-080612a870a8137c509061a33b35916cd2bc6eac.tar.bz2 nixlib-080612a870a8137c509061a33b35916cd2bc6eac.tar.lz nixlib-080612a870a8137c509061a33b35916cd2bc6eac.tar.xz nixlib-080612a870a8137c509061a33b35916cd2bc6eac.tar.zst nixlib-080612a870a8137c509061a33b35916cd2bc6eac.zip | |
qt5.full: add qtwebview module to 5.11 and 5.12 packages
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.11/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.12/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebview.nix | 20 |
3 files changed, 24 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index b6e24c632224..257e92152462 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -125,6 +125,7 @@ let qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; + qtwebview = callPackage ../modules/qtwebview.nix {}; qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; @@ -134,7 +135,7 @@ let qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtx11extras qtxmlpatterns + qtwebview qtx11extras qtxmlpatterns ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 4b002837c3d5..e6af24cd8f6a 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -121,6 +121,7 @@ let qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; qtwebkit = callPackage ../modules/qtwebkit.nix {}; qtwebsockets = callPackage ../modules/qtwebsockets.nix {}; + qtwebview = callPackage ../modules/qtwebview.nix {}; qtx11extras = callPackage ../modules/qtx11extras.nix {}; qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {}; @@ -130,7 +131,7 @@ let qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtx11extras qtxmlpatterns + qtwebview qtx11extras qtxmlpatterns ] ++ optional (!stdenv.isDarwin) qtwayland ++ optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/modules/qtwebview.nix b/pkgs/development/libraries/qt-5/modules/qtwebview.nix new file mode 100644 index 000000000000..6d5274cbc586 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtwebview.nix @@ -0,0 +1,20 @@ +{ darwin, stdenv, qtModule, qtdeclarative, qtwebengine }: + +with stdenv.lib; + +qtModule { + name = "qtwebview"; + qtInputs = [ qtdeclarative qtwebengine ]; + buildInputs = optional (stdenv.isDarwin) [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.WebKit + + # For: + # _OBJC_CLASS_$_NSArray + # _OBJC_CLASS_$_NSDate + # _OBJC_CLASS_$_NSURL + darwin.cf-private + ]; + outputs = [ "out" "dev" "bin" ]; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation -framework WebKit"; +} \ No newline at end of file |