dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #64720 from worldofpeace/wrapqt-libexec

Browse Source 
wrapQtAppsHook: wrap binaries in libexec
This commit is contained in:
worldofpeace 2019-07-19 16:28:17 -04:00 committed by GitHub
commit 4c8eaa3d2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
View File

@ -11,10 +11,5 @@ mkDerivation {
propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
preConfigure = '' outputBin = "dev";
outputBin=dev
'';
postInstall = ''
moveToOutput share/man $dev
'';
} }

8
pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh
View File

@ -64,10 +64,6 @@ qtOwnPathsHook() {
preFixupPhases+=" qtOwnPathsHook" preFixupPhases+=" qtOwnPathsHook"
isQtApp () {
readelf -d "$1" 2>/dev/null | grep -q -F 'libQt5Core'
}
# Note: $qtWrapperArgs still gets defined even if $dontWrapQtApps is set. # Note: $qtWrapperArgs still gets defined even if $dontWrapQtApps is set.
wrapQtAppsHook() { wrapQtAppsHook() {
# skip this hook when requested # skip this hook when requested
@ -77,7 +73,7 @@ wrapQtAppsHook() {
[ -z "$wrapQtAppsHookHasRun" ] || return 0 [ -z "$wrapQtAppsHookHasRun" ] || return 0
wrapQtAppsHookHasRun=1 wrapQtAppsHookHasRun=1
local targetDirs=( "$prefix/bin" ) local targetDirs=( "$prefix/bin" "$prefix/libexec" )
echo "wrapping Qt applications in ${targetDirs[@]}" echo "wrapping Qt applications in ${targetDirs[@]}"
for targetDir in "${targetDirs[@]}" for targetDir in "${targetDirs[@]}"
@ -86,7 +82,7 @@ wrapQtAppsHook() {
find "$targetDir" -executable -print0 | while IFS= read -r -d '' file find "$targetDir" -executable -print0 | while IFS= read -r -d '' file
do do
isQtApp "$file" || continue isELF "$file" || continue
if [ -f "$file" ] if [ -f "$file" ]
then then