public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18052 from loskutov/master

Browse Source 
Qt5: Enable Wayland support
This commit is contained in:
Thomas Tuegel
2016-08-28 07:38:23 -05:00
committed by GitHub
parent b8a83d901f cc83045026
commit 43bf5d2c30
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/qt-5/5.6/default.nix
+3 -3
View File
@@ -92,7 +92,7 @@ let
qtsvg = callPackage ./qtsvg.nix {}; qtsvg = callPackage ./qtsvg.nix {};
qttools = callPackage ./qttools {}; qttools = callPackage ./qttools {};
qttranslations = callPackage ./qttranslations.nix {}; qttranslations = callPackage ./qttranslations.nix {};
/* qtwayland = not packaged */ qtwayland = callPackage ./qtwayland.nix {};
qtwebchannel = callPackage ./qtwebchannel.nix {}; qtwebchannel = callPackage ./qtwebchannel.nix {};
qtwebengine = callPackage ./qtwebengine.nix {}; qtwebengine = callPackage ./qtwebengine.nix {};
qtwebkit = callPackage ./qtwebkit {}; qtwebkit = callPackage ./qtwebkit {};
@@ -105,8 +105,8 @@ let
full = env "qt-${qtbase.version}" [ full = env "qt-${qtbase.version}" [
qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets qtsensors qtserialport qtsvg qttools qttranslations qtwayland
qtx11extras qtxmlpatterns qtwebsockets qtx11extras qtxmlpatterns
]; ];
makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
pkgs/development/libraries/qt-5/5.6/qtwayland.nix
+8
View File
@@ -0,0 +1,8 @@
{ qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }:
qtSubmodule {
name = "qtwayland";
qtInputs = [ qtbase qtquickcontrols ];
buildInputs = [ wayland ];
nativeBuildInputs = [ pkgconfig ];
}
pkgs/development/libraries/qt-5/5.7/default.nix
+3 -2
View File
@@ -88,6 +88,7 @@ let
qtsvg = callPackage ./qtsvg.nix {}; qtsvg = callPackage ./qtsvg.nix {};
qttools = callPackage ./qttools {}; qttools = callPackage ./qttools {};
qttranslations = callPackage ./qttranslations.nix {}; qttranslations = callPackage ./qttranslations.nix {};
qtwayland = callPackage ./qtwayland.nix {};
qtwebchannel = callPackage ./qtwebchannel.nix {}; qtwebchannel = callPackage ./qtwebchannel.nix {};
qtwebengine = callPackage ./qtwebengine.nix {}; qtwebengine = callPackage ./qtwebengine.nix {};
qtwebkit = callPackage ./qtwebkit {}; qtwebkit = callPackage ./qtwebkit {};
@@ -99,8 +100,8 @@ let
full = env "qt-${qtbase.version}" [ full = env "qt-${qtbase.version}" [
qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets qtsensors qtserialport qtsvg qttools qttranslations qtwayland
qtx11extras qtxmlpatterns qtwebsockets qtx11extras qtxmlpatterns
]; ];
makeQtWrapper = makeQtWrapper =
pkgs/development/libraries/qt-5/5.7/qtwayland.nix
+8
View File
@@ -0,0 +1,8 @@
{ qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }:
qtSubmodule {
name = "qtwayland";
qtInputs = [ qtbase qtquickcontrols ];
buildInputs = [ wayland ];
nativeBuildInputs = [ pkgconfig ];
}