From 7aa1caa4d31569d222c96e01ec29a40dbea5178e Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 26 Jun 2016 22:48:03 +0200 Subject: [PATCH 1/2] qtwebchannel init at 5.6.1-1 --- pkgs/development/libraries/qt-5/5.6/default.nix | 2 +- pkgs/development/libraries/qt-5/5.6/qtwebchannel.nix | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebchannel.nix diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index b5255b4bce1..4a51e244a0d 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -95,7 +95,7 @@ let qttools = callPackage ./qttools.nix {}; qttranslations = callPackage ./qttranslations.nix {}; /* qtwayland = not packaged */ - /* qtwebchannel = not packaged */ + qtwebchannel = callPackage ./qtwebchannel.nix {}; /* qtwebengine = not packaged */ qtwebsockets = callPackage ./qtwebsockets.nix {}; /* qtwinextras = not packaged */ diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.6/qtwebchannel.nix new file mode 100644 index 00000000000..fd7a3c52026 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebchannel.nix @@ -0,0 +1,7 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtwebchannel"; + qtInputs = [ qtbase qtdeclarative ]; +} + From 3d0e582b38d852493931de4465ff4b118ca9b049 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 26 Jun 2016 22:49:23 +0200 Subject: [PATCH 2/2] qtwebengine init at 5.6.1-1 --- pkgs/development/libraries/qt-5/5.6/default.nix | 2 +- pkgs/development/libraries/qt-5/5.6/qtwebengine.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebengine.nix diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 4a51e244a0d..3cc8c51909b 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -96,7 +96,7 @@ let qttranslations = callPackage ./qttranslations.nix {}; /* qtwayland = not packaged */ qtwebchannel = callPackage ./qtwebchannel.nix {}; - /* qtwebengine = not packaged */ + qtwebengine = callPackage ./qtwebengine.nix {}; qtwebsockets = callPackage ./qtwebsockets.nix {}; /* qtwinextras = not packaged */ qtx11extras = callPackage ./qtx11extras.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix new file mode 100644 index 00000000000..a433976dad1 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel }: + +qtSubmodule { + name = "qtwebengine"; + qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; +}