pyrox.dev / nixpkgs
lol
fork atom

Qt5: Enable Wayland support

Ignat Loskutov cc830450 c82d9e9f

+22 -5
+3 -3
pkgs/development/libraries/qt-5/5.6/default.nix
··· 92 92 qtsvg = callPackage ./qtsvg.nix {}; 93 93 qttools = callPackage ./qttools {}; 94 94 qttranslations = callPackage ./qttranslations.nix {}; 95 - /* qtwayland = not packaged */ 95 + qtwayland = callPackage ./qtwayland.nix {}; 96 96 qtwebchannel = callPackage ./qtwebchannel.nix {}; 97 97 qtwebengine = callPackage ./qtwebengine.nix {}; 98 98 qtwebkit = callPackage ./qtwebkit {}; ··· 105 105 full = env "qt-${qtbase.version}" [ 106 106 qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects 107 107 qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript 108 - qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets 109 - qtx11extras qtxmlpatterns 108 + qtsensors qtserialport qtsvg qttools qttranslations qtwayland 109 + qtwebsockets qtx11extras qtxmlpatterns 110 110 ]; 111 111 112 112 makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
+8
pkgs/development/libraries/qt-5/5.6/qtwayland.nix
··· 1 + { qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }: 2 + 3 + qtSubmodule { 4 + name = "qtwayland"; 5 + qtInputs = [ qtbase qtquickcontrols ]; 6 + buildInputs = [ wayland ]; 7 + nativeBuildInputs = [ pkgconfig ]; 8 + }
+3 -2
pkgs/development/libraries/qt-5/5.7/default.nix
··· 88 88 qtsvg = callPackage ./qtsvg.nix {}; 89 89 qttools = callPackage ./qttools {}; 90 90 qttranslations = callPackage ./qttranslations.nix {}; 91 + qtwayland = callPackage ./qtwayland.nix {}; 91 92 qtwebchannel = callPackage ./qtwebchannel.nix {}; 92 93 qtwebengine = callPackage ./qtwebengine.nix {}; 93 94 qtwebkit = callPackage ./qtwebkit {}; ··· 99 100 full = env "qt-${qtbase.version}" [ 100 101 qtconnectivity qtdeclarative qtdoc qtgraphicaleffects 101 102 qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript 102 - qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets 103 - qtx11extras qtxmlpatterns 103 + qtsensors qtserialport qtsvg qttools qttranslations qtwayland 104 + qtwebsockets qtx11extras qtxmlpatterns 104 105 ]; 105 106 106 107 makeQtWrapper =
+8
pkgs/development/libraries/qt-5/5.7/qtwayland.nix
··· 1 + { qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }: 2 + 3 + qtSubmodule { 4 + name = "qtwayland"; 5 + qtInputs = [ qtbase qtquickcontrols ]; 6 + buildInputs = [ wayland ]; 7 + nativeBuildInputs = [ pkgconfig ]; 8 + }