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

Merge pull request #59940 from romildo/fix.deepin.deepin-wm 

deepin.deepin-wm: fix paths related to plugins and desktop files
This commit is contained in:
José Romildo Malaquias 2019-05-10 23:35:54 -03:00 committed by GitHub
parent 39a1f3c8d3 edc66ee77c
commit 76e3af41a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/desktops/deepin/deepin-wm/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3, { stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, vala, gnome3,
bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3, libwnck3, dbus, bamf, clutter-gtk, pantheon, libgee, libcanberra-gtk3,
deepin-menu, deepin-mutter, deepin-wallpapers, libwnck3, deepin-menu, deepin-mutter, deepin-wallpapers,
deepin-desktop-schemas, wrapGAppsHook, deepin }: deepin-desktop-schemas, wrapGAppsHook, deepin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bamf bamf
clutter-gtk clutter-gtk
dbus
deepin-desktop-schemas deepin-desktop-schemas
deepin-menu deepin-menu
deepin-mutter deepin-mutter
@ -40,10 +41,15 @@ stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
searchHardCodedPaths searchHardCodedPaths # debugging
fixPath ${deepin-wallpapers} /usr/share/backgrounds src/Background/BackgroundSource.vala
# fix background path # 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 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"; NIX_CFLAGS_COMPILE = "-DWNCK_I_KNOW_THIS_IS_UNSTABLE";
@ -52,6 +58,10 @@ stdenv.mkDerivation rec {
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
''; '';
postFixup = ''
searchHardCodedPaths $out # debugging
'';
enableParallelBuilding = true; enableParallelBuilding = true;
passthru.updateScript = deepin.updateScript { inherit name; }; passthru.updateScript = deepin.updateScript { inherit name; };