summary refs log tree commit diff
path: root/pkgs/development/libraries/qt-5/5.8/default.nix
diff options
context:
space:
mode:
authorPeriklis Tsirakidis <periklis.tsirakidis@mayflower.de>2017-03-26 00:16:51 +0100
committerPeriklis Tsirakidis <periklis.tsirakidis@mayflower.de>2017-04-08 09:54:46 +0200
commit775531c1e3d996db5705aee3f2e2f6a583912c9d (patch)
tree3a3cadc7005447a6f6bb0c43ef98373557dfd598 /pkgs/development/libraries/qt-5/5.8/default.nix
parentefe12d665812e2c5f7c20513a829edff5b8b1977 (diff)
downloadnixlib-775531c1e3d996db5705aee3f2e2f6a583912c9d.tar
nixlib-775531c1e3d996db5705aee3f2e2f6a583912c9d.tar.gz
nixlib-775531c1e3d996db5705aee3f2e2f6a583912c9d.tar.bz2
nixlib-775531c1e3d996db5705aee3f2e2f6a583912c9d.tar.lz
nixlib-775531c1e3d996db5705aee3f2e2f6a583912c9d.tar.xz
nixlib-775531c1e3d996db5705aee3f2e2f6a583912c9d.tar.zst
nixlib-775531c1e3d996db5705aee3f2e2f6a583912c9d.zip
qt58: extend darwin compatibility
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.8/default.nix')
-rw-r--r--pkgs/development/libraries/qt-5/5.8/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index eb26f88f7258..2865a879f47d 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -76,6 +76,7 @@ let
       qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
       qtimageformats = callPackage ./qtimageformats.nix {};
       qtlocation = callPackage ./qtlocation.nix {};
+      qtmacextras = callPackage ./qtmacextras.nix {};
       qtmultimedia = callPackage ./qtmultimedia.nix {
         inherit gstreamer gst-plugins-base;
       };
@@ -97,12 +98,13 @@ let
       qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
 
       env = callPackage ../qt-env.nix {};
-      full = env "qt-${qtbase.version}" [
+      full = env "qt-${qtbase.version}" ([
         qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
         qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
-        qtsensors qtserialport qtsvg qttools qttranslations qtwayland
+        qtsensors qtserialport qtsvg qttools qttranslations
         qtwebsockets qtx11extras qtxmlpatterns
-      ];
+      ] ++ optional (!stdenv.isDarwin) qtwayland
+        ++ optional (stdenv.isDarwin) qtmacextras);
 
       makeQtWrapper =
         makeSetupHook