diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-28 07:38:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-28 07:38:23 -0500 |
| commit | 43bf5d2c300bf7667440c4937c0eed2788e279c8 (patch) | |
| tree | 7116f8f9e6faeccae2e032b923996db6f92b29e9 /pkgs/development/libraries/qt-5 | |
| parent | b8a83d901ff39d43c540aa03651f789bac6706b0 (diff) | |
| parent | cc830450265cb25281e1ef49ca4e8bf9b416b408 (diff) | |
| download | nixpkgs-43bf5d2c300bf7667440c4937c0eed2788e279c8.tar nixpkgs-43bf5d2c300bf7667440c4937c0eed2788e279c8.tar.gz nixpkgs-43bf5d2c300bf7667440c4937c0eed2788e279c8.tar.bz2 nixpkgs-43bf5d2c300bf7667440c4937c0eed2788e279c8.tar.lz nixpkgs-43bf5d2c300bf7667440c4937c0eed2788e279c8.tar.xz nixpkgs-43bf5d2c300bf7667440c4937c0eed2788e279c8.tar.zst nixpkgs-43bf5d2c300bf7667440c4937c0eed2788e279c8.zip | |
Merge pull request #18052 from loskutov/master
Qt5: Enable Wayland support
Diffstat (limited to 'pkgs/development/libraries/qt-5')
4 files changed, 22 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 1f03b138f25..54624fa99b7 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 00000000000..6d887f7c650 --- /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 aa2cbb92169..286ef0887c7 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 00000000000..6d887f7c650 --- /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 ]; +} |