Merge pull request #55877 from dtzWill/fix/gnome-control-center-session-path-maybe

gnome-control-center: point to gnome-session's libexecdir properly
This commit is contained in:
worldofpeace 2019-02-17 03:49:10 +00:00 committed by GitHub
commit 3eec4b57c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,7 +4,7 @@
, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
, cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc , cracklib, libkrb5, networkmanagerapplet, networkmanager, glibc
, libwacom, samba, shared-mime-info, tzdata, libtool, libgnomekbd , 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 }: , fontconfig, sound-theme-freedesktop, grilo, python3 }:
let let
@ -46,6 +46,10 @@ in stdenv.mkDerivation rec {
patchShebangs build-aux/meson/meson_post_install.py patchShebangs build-aux/meson/meson_post_install.py
''; '';
mesonFlags = [
"-Dgnome_session_libexecdir=${gnome-session}/libexec"
];
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share" --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"