ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-07 22:11:45 +03:00
Code Issues Projects Releases Wiki Activity

pantheon.elementary-greeter: correct substituteAll

Browse Source
This commit is contained in:
worldofpeace 2019-04-05 02:00:43 -04:00
parent 3e6b38ebc8
commit c2ac422d40
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View File

@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./gsd.patch; src = ./gsd.patch;
elementary-settings-daemon = "${elementary-settings-daemon}/libexec"; elementary_settings_daemon = "${elementary-settings-daemon}/libexec/";
}) })
(substituteAll { (substituteAll {
src = ./numlockx.patch; src = ./numlockx.patch;

2
pkgs/desktops/pantheon/desktop/elementary-greeter/gsd.patch
View File

@ -7,7 +7,7 @@ index 2450c1a..a908d11 100644
conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm')) conf_data.set('CONF_DIR', join_paths(get_option('sysconfdir'), 'lightdm'))
conf_data.set('GETTEXT_PACKAGE', meson.project_name()) conf_data.set('GETTEXT_PACKAGE', meson.project_name())
-conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/') -conf_data.set('GSD_DIR', '/usr/lib/gnome-settings-daemon/')
+conf_data.set('GSD_DIR', '@elementary-settings-daemon@') +conf_data.set('GSD_DIR', '@elementary_settings_daemon@')
conf_data.set('VERSION', meson.project_version()) conf_data.set('VERSION', meson.project_version())
config_header = configure_file ( config_header = configure_file (
input: 'config.vala.in', input: 'config.vala.in',