diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index 37e4cb2002b2..986bee2f0dd2 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, - bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, libwnck3, - deepin-menu, deepin-mutter, deepin-wallpapers, + dbus, bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, + libwnck3, deepin-menu, deepin-mutter, deepin-wallpapers, deepin-desktop-schemas, wrapGAppsHook, deepin }: stdenv.mkDerivation rec { @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ bamf clutter-gtk + dbus deepin-desktop-schemas deepin-menu deepin-mutter @@ -40,10 +41,15 @@ stdenv.mkDerivation rec { ]; postPatch = '' - searchHardCodedPaths - fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala + searchHardCodedPaths # debugging + # fix background path + fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala sed -i 's|default_background.jpg|deepin/desktop.jpg|' src/Background/BackgroundSource.vala + + # fix executable paths in desktop files + sed -i -e "s,Exec=dbus-send,Exec=${dbus}/bin/dbus-send," data/gala-multitaskingview.desktop.in + sed -i -e "s,Exec=deepin-wm,Exec=$out/bin/deepin-wm," data/gala.desktop ''; NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE"; @@ -52,6 +58,10 @@ stdenv.mkDerivation rec { NOCONFIGURE=1 ./autogen.sh ''; + postFixup = '' + searchHardCodedPaths $out # debugging + ''; + enableParallelBuilding = true; passthru.updateScript = deepin.updateScript { inherit name; };