summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2019-02-17 03:49:10 +0000
committerGitHub <noreply@github.com>2019-02-17 03:49:10 +0000
commit3eec4b57c20742b6306c4f8d6ef8135c22979f4b (patch)
treee256498176c2ecd4010d5a59f899a68a52447820 /pkgs
parente6b76ad3c750932e3eac9694fe9907c84ebb853c (diff)
parent22dac1e8570dce8f69e1856ca49df6361180142c (diff)
downloadnixpkgs-3eec4b57c20742b6306c4f8d6ef8135c22979f4b.tar
nixpkgs-3eec4b57c20742b6306c4f8d6ef8135c22979f4b.tar.gz
nixpkgs-3eec4b57c20742b6306c4f8d6ef8135c22979f4b.tar.bz2
nixpkgs-3eec4b57c20742b6306c4f8d6ef8135c22979f4b.tar.lz
nixpkgs-3eec4b57c20742b6306c4f8d6ef8135c22979f4b.tar.xz
nixpkgs-3eec4b57c20742b6306c4f8d6ef8135c22979f4b.tar.zst
nixpkgs-3eec4b57c20742b6306c4f8d6ef8135c22979f4b.zip
Merge pull request #55877 from dtzWill/fix/gnome-control-center-session-path-maybe
gnome-control-center: point to gnome-session's libexecdir properly
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/desktops/gnome-3/core/gnome-control-center/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index f1423f883d4..58afc0ab85d 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -4,7 +4,7 @@
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
 , libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd
-, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese
+, docbook_xsl, modemmanager, clutter, clutter-gtk, cheese, gnome-session
 , fontconfig, sound-theme-freedesktop, grilo, python3 }:
 
 let
@@ -46,6 +46,10 @@ in stdenv.mkDerivation rec {
     patchShebangs build-aux/meson/meson_post_install.py
   '';
 
+  mesonFlags = [
+    "-Dgnome_session_libexecdir=${gnome-session}/libexec"
+  ];
+
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"