diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix index 66e2700f192..02862abca49 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 diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix index 3b899a91d4a..6d96b1b5082 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;