about summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2019-09-16 10:49:58 +0200
committerTor Hedin Brønner <torhedinbronner@gmail.com>2019-09-30 19:39:50 +0200
commitb916c657066277e8d30c5061caf4e2068f64f380 (patch)
tree1bacd1eb3ad36bfd946ac297864421ad95383d51 /pkgs/desktops/gnome-3
parentd27212d466d0e79c3d9781b60aa3374d234370c0 (diff)
downloadnixlib-b916c657066277e8d30c5061caf4e2068f64f380.tar
nixlib-b916c657066277e8d30c5061caf4e2068f64f380.tar.gz
nixlib-b916c657066277e8d30c5061caf4e2068f64f380.tar.bz2
nixlib-b916c657066277e8d30c5061caf4e2068f64f380.tar.lz
nixlib-b916c657066277e8d30c5061caf4e2068f64f380.tar.xz
nixlib-b916c657066277e8d30c5061caf4e2068f64f380.tar.zst
nixlib-b916c657066277e8d30c5061caf4e2068f64f380.zip
gnome3.gnome-shell: hardcode gsettings path
Diffstat (limited to 'pkgs/desktops/gnome-3')
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-shell/default.nix1
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch9
2 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 6c26c8c4fa40..abd467d2aa4d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -60,6 +60,7 @@ in stdenv.mkDerivation rec {
     (substituteAll {
       src = ./fix-paths.patch;
       inherit libgnomekbd unzip;
+      gsettings = "${glib.bin}/bin/gsettings";
     })
   ];
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index 9cb9655b72e5..7b93475619b2 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -19,3 +19,12 @@
 +        Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
      }
  });
+--- a/data/gnome-shell-disable-extensions.service
++++ b/data/gnome-shell-disable-extensions.service
+@@ -10,5 +10,5 @@ Requisite=gnome-session-stable.timer
+ [Service]
+ Type=simple
+ # Disable extensions
+-ExecStart=gsettings set org.gnome.shell disable-user-extensions true
++ExecStart=@gsettings@ set org.gnome.shell disable-user-extensions true
+ Restart=no