diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-19 16:28:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 16:28:17 -0400 |
| commit | 4c8eaa3d2ed7d32c19d31116f94de0eda5e35654 (patch) | |
| tree | 1797398b3fdb15c938283e51d05efa86d1ec123b /pkgs | |
| parent | cc0879853120d02ca7b18e08b1194b367d0e0fe7 (diff) | |
| parent | 7d6ab0ad7a5a5b1765a6d70b5df861d14e3c3482 (diff) | |
| download | nixlib-4c8eaa3d2ed7d32c19d31116f94de0eda5e35654.tar nixlib-4c8eaa3d2ed7d32c19d31116f94de0eda5e35654.tar.gz nixlib-4c8eaa3d2ed7d32c19d31116f94de0eda5e35654.tar.bz2 nixlib-4c8eaa3d2ed7d32c19d31116f94de0eda5e35654.tar.lz nixlib-4c8eaa3d2ed7d32c19d31116f94de0eda5e35654.tar.xz nixlib-4c8eaa3d2ed7d32c19d31116f94de0eda5e35654.tar.zst nixlib-4c8eaa3d2ed7d32c19d31116f94de0eda5e35654.zip | |
Merge pull request #64720 from worldofpeace/wrapqt-libexec
wrapQtAppsHook: wrap binaries in libexec
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh | 8 |
2 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index 3943e5d6d494..e06d9547de07 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -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"; } diff --git a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh index 83f62e4ec2b8..e7d7d1326174 100644 --- a/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh @@ -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 |