From cc830450265cb25281e1ef49ca4e8bf9b416b408 Mon Sep 17 00:00:00 2001 From: Ignat Loskutov Date: Sun, 28 Aug 2016 00:57:43 -0400 Subject: [PATCH] Qt5: Enable Wayland support --- pkgs/development/libraries/qt-5/5.6/default.nix | 6 +++--- pkgs/development/libraries/qt-5/5.6/qtwayland.nix | 8 ++++++++ pkgs/development/libraries/qt-5/5.7/default.nix | 5 +++-- pkgs/development/libraries/qt-5/5.7/qtwayland.nix | 8 ++++++++ 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwayland.nix create mode 100644 pkgs/development/libraries/qt-5/5.7/qtwayland.nix diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 1f03b138f252..54624fa99b73 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -92,7 +92,7 @@ let qtsvg = callPackage ./qtsvg.nix {}; qttools = callPackage ./qttools {}; qttranslations = callPackage ./qttranslations.nix {}; - /* qtwayland = not packaged */ + qtwayland = callPackage ./qtwayland.nix {}; qtwebchannel = callPackage ./qtwebchannel.nix {}; qtwebengine = callPackage ./qtwebengine.nix {}; qtwebkit = callPackage ./qtwebkit {}; @@ -105,8 +105,8 @@ let full = env "qt-${qtbase.version}" [ qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript - qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets - qtx11extras qtxmlpatterns + qtsensors qtserialport qtsvg qttools qttranslations qtwayland + qtwebsockets qtx11extras qtxmlpatterns ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; diff --git a/pkgs/development/libraries/qt-5/5.6/qtwayland.nix b/pkgs/development/libraries/qt-5/5.6/qtwayland.nix new file mode 100644 index 000000000000..6d887f7c650b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwayland.nix @@ -0,0 +1,8 @@ +{ qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }: + +qtSubmodule { + name = "qtwayland"; + qtInputs = [ qtbase qtquickcontrols ]; + buildInputs = [ wayland ]; + nativeBuildInputs = [ pkgconfig ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index aa2cbb921698..286ef0887c7a 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -88,6 +88,7 @@ let qtsvg = callPackage ./qtsvg.nix {}; qttools = callPackage ./qttools {}; qttranslations = callPackage ./qttranslations.nix {}; + qtwayland = callPackage ./qtwayland.nix {}; qtwebchannel = callPackage ./qtwebchannel.nix {}; qtwebengine = callPackage ./qtwebengine.nix {}; qtwebkit = callPackage ./qtwebkit {}; @@ -99,8 +100,8 @@ let full = env "qt-${qtbase.version}" [ qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript - qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets - qtx11extras qtxmlpatterns + qtsensors qtserialport qtsvg qttools qttranslations qtwayland + qtwebsockets qtx11extras qtxmlpatterns ]; makeQtWrapper = diff --git a/pkgs/development/libraries/qt-5/5.7/qtwayland.nix b/pkgs/development/libraries/qt-5/5.7/qtwayland.nix new file mode 100644 index 000000000000..6d887f7c650b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtwayland.nix @@ -0,0 +1,8 @@ +{ qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }: + +qtSubmodule { + name = "qtwayland"; + qtInputs = [ qtbase qtquickcontrols ]; + buildInputs = [ wayland ]; + nativeBuildInputs = [ pkgconfig ]; +}