From afa4c3aed2d75636eba1dd5f3e63388d2b9a73d2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 Mar 2015 17:28:44 -0500
Subject: [PATCH 1/2] autonix: allow one-to-many dependency resolution

---
 pkgs/build-support/autonix/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix
index 66e2700f192a..02862abca498 100644
--- a/pkgs/build-support/autonix/default.nix
+++ b/pkgs/build-support/autonix/default.nix
@@ -146,7 +146,11 @@ let
 
   mkDerivation = drv: stdenv.mkDerivation (drv // { src = fetchurl drv.src; });
 
-  resolveDeps = scope: map (dep: scope."${dep}" or null);
+  resolveDeps = scope:
+    let resolveDeps_go = dep:
+          let res = scope."${dep}" or [];
+          in if isList res then res else [res];
+    in concatMap resolveDeps_go;
 
   userEnvPkg = dep:
     mapAttrs

From a1700f84002920be6b592b5216660d6c07f8e33c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 Mar 2015 17:37:29 -0500
Subject: [PATCH 2/2] kf57: include Qt GraphicalEffects submodule

---
 pkgs/development/libraries/kde-frameworks-5.7/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix
index 3b899a91d4ae..6d96b1b50820 100644
--- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.7/default.nix
@@ -56,8 +56,8 @@ let
       Qt5DBus = qt5.base;
       Qt5Gui = qt5.base;
       Qt5LinguistTools = qt5.tools;
-      Qt5Qml = qt5.declarative;
-      Qt5Quick = qt5.quickcontrols;
+      Qt5Qml = [qt5.declarative qt5.graphicaleffects];
+      Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects];
       Qt5Script = qt5.script;
       Qt5Svg = qt5.svg;
       Qt5WebkitWidgets = qt5.webkit;