alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

qt5Full: only include derivations

Browse source
This commit is contained in:
Thomas Tuegel 2015-09-19 11:37:39 -05:00
parent a074852aa6
commit e5b124e492
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/qt-5/qt-env.nix
View file

@ -16,16 +16,15 @@ Qml2Imports = lib/qt5/qml
Documentation = share/doc/qt5 Documentation = share/doc/qt5
EOF EOF
for path in $paths; do for pkg in $paths $qtbase; do
if [[ -d "$path/mkspecs" ]]; then if [[ -d "$pkg/mkspecs" ]]; then
${lndir}/bin/lndir -silent "$path/mkspecs" "$out/mkspecs" ${lndir}/bin/lndir -silent "$pkg/mkspecs" "$out/mkspecs"
for dir in bin include lib share; do for dir in bin include lib share; do
if [[ -d "$path/$dir" ]]; then if [[ -d "$pkg/$dir" ]]; then
${lndir}/bin/lndir -silent "$path/$dir" "$out/$dir" ${lndir}/bin/lndir -silent "$pkg/$dir" "$out/$dir"
fi fi
done done
fi fi
done done
'' ''

2
pkgs/top-level/all-packages.nix
View file

@ -7891,7 +7891,7 @@ let
qt5Full = appendToName "full" (qtEnv { qt5Full = appendToName "full" (qtEnv {
qtbase = qt5.base; qtbase = qt5.base;
paths = lib.filter (x: !(builtins.isFunction x)) (lib.attrValues qt5); paths = lib.filter lib.isDerivation (lib.attrValues qt5);
}); });
qtcreator = callPackage ../development/qtcreator { qtcreator = callPackage ../development/qtcreator {