diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-08 11:00:30 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-07 20:13:27 -0500 |
| commit | 62095621d7a953f4e6da9d857a90200dce8c7707 (patch) | |
| tree | 0a5ab66c11ada1be2e843d3396fb3067cac3e629 /pkgs/desktops | |
| parent | f4e0ae2bb2fd811570d54f029ae3818266809515 (diff) | |
| download | nixpkgs-62095621d7a953f4e6da9d857a90200dce8c7707.tar nixpkgs-62095621d7a953f4e6da9d857a90200dce8c7707.tar.gz nixpkgs-62095621d7a953f4e6da9d857a90200dce8c7707.tar.bz2 nixpkgs-62095621d7a953f4e6da9d857a90200dce8c7707.tar.lz nixpkgs-62095621d7a953f4e6da9d857a90200dce8c7707.tar.xz nixpkgs-62095621d7a953f4e6da9d857a90200dce8c7707.tar.zst nixpkgs-62095621d7a953f4e6da9d857a90200dce8c7707.zip | |
deepin.dde-launcher: use gapps wrapper
Forgot about wrapQtAppsHook only wrapping binaries that are ELF headers. So it can't wrap it if it already is.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/deepin/dde-launcher/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index f5e5f23cc2c..eae074381f3 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -1,7 +1,7 @@ { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers, dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras, - which, xdg_utils, wrapGAppsHook }: + which, xdg_utils, wrapGAppsHook, glib }: mkDerivation rec { pname = "dde-launcher"; @@ -29,6 +29,7 @@ mkDerivation rec { deepin-wallpapers dtkcore dtkwidget + glib gsettings-qt qtsvg qtx11extras @@ -58,6 +59,14 @@ mkDerivation rec { # note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0 ''; + dontWrapQtApps = true; + + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; + postFixup = '' # debugging searchHardCodedPaths $out |