Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deepin.deepin-wm: fix paths related to plugins and desktop files #59940

Merged
merged 1 commit into from
May 11, 2019
Merged

deepin.deepin-wm: fix paths related to plugins and desktop files #59940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions pkgs/desktops/deepin/deepin-wm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bamf
clutter-gtk
dbus
deepin-desktop-schemas
deepin-menu
deepin-mutter
Expand All @@ -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";
Expand All @@ -52,6 +58,10 @@ stdenv.mkDerivation rec {
NOCONFIGURE=1 ./autogen.sh
'';

postFixup = ''
searchHardCodedPaths $out # debugging
'';

enableParallelBuilding = true;

passthru.updateScript = deepin.updateScript { inherit name; };
Expand Down