ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8590 from NixOS/fix-qt5-setup-hook

Browse Source 
qt54: fix setup-hook.sh, lib/ was not populated in some cases
This commit is contained in:
Thomas Tuegel 2015-07-01 17:00:01 -05:00
commit 726b111c6c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/qt-5/5.4/setup-hook.sh
View File

@ -20,9 +20,11 @@ addQtModule() {
fi
fi
if [[ -n $qtSubmodule ]] && [[ -d "$1/lib" ]]; then
if [[ -d "$1/lib" ]]; then
@lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
if [[ -n $qtSubmodule ]]; then
find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
fi
fi
fi
}