From 735199a2104bc52b09f0193bdce7b1d95e4c7288 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 21 Jul 2019 22:53:18 -0400 Subject: deepin: use qt5.mkDerivation where needed, cleanup wrappers This switches a majority of the applications to using qt5.mkDerivation which automatically adds wrapQtAppsHook. In certain places, where GLib and gtk intersect with Qt, we also needed to use wrapGAppsHook. In these cases there will be multiple wrappers. --- pkgs/desktops/deepin/deepin-metacity/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/desktops/deepin/deepin-metacity') diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index fdf2c240e2c89..a4aede5857c97 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, glib, gtk3, libgtop, bamf, json-glib, libcanberra-gtk3, libxkbcommon, libstartup_notification, deepin-wallpapers, deepin-desktop-schemas, - deepin }: + deepin, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { libtool glib.dev gnome3.gnome-common + wrapGAppsHook ]; buildInputs = [ -- cgit 1.4.1