From 2fe9525dff97d848c47085d6786cba146d91d156 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 8 Aug 2019 11:00:08 -0400 Subject: [PATCH] deepin.dde-dock: use gapps wrapper Forgot about wrapQtAppsHook only wrapping binaries that are ELF headers. So it can't wrap it if it already is. --- pkgs/desktops/deepin/dde-dock/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index 7b44b69d5b7b..62d5622340c2 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -31,7 +31,7 @@ unwrapped = mkDerivation rec { deepin-desktop-schemas dtkcore dtkwidget - glib.bin + glib gsettings-qt libdbusmenu polkit @@ -64,6 +64,14 @@ unwrapped = mkDerivation rec { cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + postFixup = '' searchHardCodedPaths $out '';