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

Merge branch 'kde5'

Browse Source
This commit is contained in:
Thomas Tuegel 2015-03-09 06:43:13 -05:00
commit 7b2adc0039
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/build-support/autonix/default.nix
View File

@ -146,7 +146,11 @@ let
mkDerivation = drv: stdenv.mkDerivation (drv // { src = fetchurl drv.src; }); 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: userEnvPkg = dep:
mapAttrs mapAttrs

4
pkgs/development/libraries/kde-frameworks-5.7/default.nix
View File

@ -56,8 +56,8 @@ let
Qt5DBus = qt5.base; Qt5DBus = qt5.base;
Qt5Gui = qt5.base; Qt5Gui = qt5.base;
Qt5LinguistTools = qt5.tools; Qt5LinguistTools = qt5.tools;
Qt5Qml = qt5.declarative; Qt5Qml = [qt5.declarative qt5.graphicaleffects];
Qt5Quick = qt5.quickcontrols; Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects];
Qt5Script = qt5.script; Qt5Script = qt5.script;
Qt5Svg = qt5.svg; Qt5Svg = qt5.svg;
Qt5WebkitWidgets = qt5.webkit; Qt5WebkitWidgets = qt5.webkit;