From f4e0ae2bb2fd811570d54f029ae3818266809515 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 8 Aug 2019 11:00:20 -0400 Subject: [PATCH] deepin.dde-file-manager: 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-file-manager/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index 62b4da71dd62..5d0d04bfb764 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -45,8 +45,7 @@ mkDerivation rec { dtkwidget ffmpegthumbnailer file - glib.bin - glib.dev + glib gnugrep gsettings-qt gvfs @@ -233,6 +232,14 @@ mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11}/lib"; ''; + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + postFixup = '' # debuging unset LD_LIBRARY_PATH