From 6c057aea5ce10871e5273dc2e3ea0b9e89c03e03 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 14 Jul 2019 00:03:34 -0400 Subject: [PATCH 1/4] wrapQtAppsHook: wrap binaries in libexec --- pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..bf7b07e2549c 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 @@ -77,7 +77,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[@]}" From 4908d382ae1eb9f618ea8745cb6794db1dba9520 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 16 Jul 2019 20:37:43 -0400 Subject: [PATCH 2/4] wrapQtAppsHook: remove isQtApp This was preventing dolphin from being wrapped. --- pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh | 6 ------ 1 file changed, 6 deletions(-) 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 bf7b07e2549c..775922c1f4c4 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 @@ -86,8 +82,6 @@ wrapQtAppsHook() { find "$targetDir" -executable -print0 | while IFS= read -r -d '' file do - isQtApp "$file" || continue - if [ -f "$file" ] then echo "wrapping $file" From 53c981f67e33ae4bbb2e13a6ba5de175ccd1963b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 16 Jul 2019 23:04:34 -0400 Subject: [PATCH 3/4] kdeFramworks.kconfigwidgets: fix outputs --- .../libraries/kde-frameworks/kconfigwidgets/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 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"; } From 7d6ab0ad7a5a5b1765a6d70b5df861d14e3c3482 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 17 Jul 2019 15:53:15 -0400 Subject: [PATCH 4/4] wrapQtAppsHook: use isELF We should still prevent things like scripts from being wrapped. --- pkgs/development/libraries/qt-5/hooks/wrap-qt-apps-hook.sh | 2 ++ 1 file changed, 2 insertions(+) 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 775922c1f4c4..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 @@ -82,6 +82,8 @@ wrapQtAppsHook() { find "$targetDir" -executable -print0 | while IFS= read -r -d '' file do + isELF "$file" || continue + if [ -f "$file" ] then echo "wrapping $file"