public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deepin.dde-launcher: use gapps wrapper

Browse Source 
Forgot about wrapQtAppsHook only wrapping
binaries that are ELF headers. So it can't wrap
it if it already is.
This commit is contained in:
worldofpeace 2019-08-08 11:00:30 -04:00
parent f4e0ae2bb2
commit 62095621d7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/deepin/dde-launcher/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory,
dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers, dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers,
dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras, dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras,
which, xdg_utils, wrapGAppsHook }: which, xdg_utils, wrapGAppsHook, glib }:
mkDerivation rec { mkDerivation rec {
pname = "dde-launcher"; pname = "dde-launcher";
@ -29,6 +29,7 @@ mkDerivation rec {
deepin-wallpapers deepin-wallpapers
dtkcore dtkcore
dtkwidget dtkwidget
glib
gsettings-qt gsettings-qt
qtsvg qtsvg
qtx11extras 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 # 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 = '' postFixup = ''
# debugging # debugging
searchHardCodedPaths $out searchHardCodedPaths $out