From e5b124e492fbf546cbc8cb216801755828d3107f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 19 Sep 2015 11:37:39 -0500 Subject: [PATCH] qt5Full: only include derivations --- pkgs/development/libraries/qt-5/qt-env.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix index 01ddbf31428..e6973015aca 100644 --- a/pkgs/development/libraries/qt-5/qt-env.nix +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -16,16 +16,15 @@ Qml2Imports = lib/qt5/qml Documentation = share/doc/qt5 EOF -for path in $paths; do - if [[ -d "$path/mkspecs" ]]; then - ${lndir}/bin/lndir -silent "$path/mkspecs" "$out/mkspecs" +for pkg in $paths $qtbase; do + if [[ -d "$pkg/mkspecs" ]]; then + ${lndir}/bin/lndir -silent "$pkg/mkspecs" "$out/mkspecs" for dir in bin include lib share; do - if [[ -d "$path/$dir" ]]; then - ${lndir}/bin/lndir -silent "$path/$dir" "$out/$dir" + if [[ -d "$pkg/$dir" ]]; then + ${lndir}/bin/lndir -silent "$pkg/$dir" "$out/$dir" fi done fi done - '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20959d7c3cf..52041c11cf0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7891,7 +7891,7 @@ let qt5Full = appendToName "full" (qtEnv { 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 {