summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-08-12 10:33:41 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-08-12 10:33:41 +0200
commit00df25ee57fcc2227ffdbbff2280b13d898bfd7d (patch)
treea2cdc854489799c6d7900b0e5ac215b7b95d762a /pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch
parent580cab57e4f188d25144e398d7b8e3d5085299a9 (diff)
parentbb3f7d14a17e88e4341872c55d8b32127c6f8101 (diff)
downloadnixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar
nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.gz
nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.bz2
nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.lz
nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.xz
nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.tar.zst
nixlib-00df25ee57fcc2227ffdbbff2280b13d898bfd7d.zip
Merge branch 'master' into staging-next
Hydra: ?compare=1472947
Diffstat (limited to 'pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch')
-rw-r--r--pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch b/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch
new file mode 100644
index 000000000000..9d5add233d61
--- /dev/null
+++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/fix-paths.patch
@@ -0,0 +1,30 @@
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -22,7 +22,7 @@
+ 	             echo 'if [ -z $$XDG_CURRENT_DESKTOP ]; then' && \
+ 	             echo '  export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"' && \
+ 	             echo 'fi' && echo '' && \
+-	             echo 'exec gnome-session --session=gnome-flashback-compiz "$$@"') > $@
++	             echo 'exec @gnomeSession@/bin/gnome-session --session=gnome-flashback-compiz "$$@"') > $@
+ 	$(AM_V_at) chmod a+x $@
+ 
+ gnome-flashback-metacity: Makefile
+@@ -30,7 +30,7 @@
+ 	             echo 'if [ -z $$XDG_CURRENT_DESKTOP ]; then' && \
+ 	             echo '  export XDG_CURRENT_DESKTOP="GNOME-Flashback:GNOME"' && \
+ 	             echo 'fi' && echo '' && \
+-	             echo 'exec gnome-session --session=gnome-flashback-metacity --disable-acceleration-check "$$@"') > $@
++	             echo 'exec @gnomeSession@/bin/gnome-session --session=gnome-flashback-metacity --disable-acceleration-check "$$@"') > $@
+ 	$(AM_V_at) chmod a+x $@
+ 
+ CLEANFILES = \
+--- a/data/xsessions/gnome-flashback-metacity.desktop.in.in
++++ b/data/xsessions/gnome-flashback-metacity.desktop.in.in
+@@ -2,6 +2,6 @@
+ Name=GNOME Flashback (Metacity)
+ Comment=This session logs you into GNOME Flashback with Metacity
+ Exec=@libexecdir@/gnome-flashback-metacity
+-TryExec=metacity
++TryExec=@metacity@/bin/metacity
+ Type=Application
+ DesktopNames=GNOME-Flashback;GNOME;