forked from mirrors/nixpkgs
Merge pull request #64720 from worldofpeace/wrapqt-libexec
wrapQtAppsHook: wrap binaries in libexec
This commit is contained in:
commit
4c8eaa3d2e
|
@ -11,10 +11,5 @@ mkDerivation {
|
|||
propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
|
||||
patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
|
||||
outputs = [ "out" "dev" ];
|
||||
preConfigure = ''
|
||||
outputBin=dev
|
||||
'';
|
||||
postInstall = ''
|
||||
moveToOutput share/man $dev
|
||||
'';
|
||||
outputBin = "dev";
|
||||
}
|
||||
|
|
|
@ -64,10 +64,6 @@ qtOwnPathsHook() {
|
|||
|
||||
preFixupPhases+=" qtOwnPathsHook"
|
||||
|
||||
isQtApp () {
|
||||
readelf -d "$1" 2>/dev/null | grep -q -F 'libQt5Core'
|
||||
}
|
||||
|
||||
# Note: $qtWrapperArgs still gets defined even if $dontWrapQtApps is set.
|
||||
wrapQtAppsHook() {
|
||||
# skip this hook when requested
|
||||
|
@ -77,7 +73,7 @@ wrapQtAppsHook() {
|
|||
[ -z "$wrapQtAppsHookHasRun" ] || return 0
|
||||
wrapQtAppsHookHasRun=1
|
||||
|
||||
local targetDirs=( "$prefix/bin" )
|
||||
local targetDirs=( "$prefix/bin" "$prefix/libexec" )
|
||||
echo "wrapping Qt applications in ${targetDirs[@]}"
|
||||
|
||||
for targetDir in "${targetDirs[@]}"
|
||||
|
@ -86,7 +82,7 @@ wrapQtAppsHook() {
|
|||
|
||||
find "$targetDir" -executable -print0 | while IFS= read -r -d '' file
|
||||
do
|
||||
isQtApp "$file" || continue
|
||||
isELF "$file" || continue
|
||||
|
||||
if [ -f "$file" ]
|
||||
then
|
||||
|
|
Loading…
Reference in a new issue