Merge pull request #330634 from r-ryantm/auto-update/circumflex
[NixPkgs.git] / pkgs / desktops / gnome / core / gnome-initial-setup / 0001-fix-paths.patch
blobf3cd9f6f042734295fe13bafe3d4081f838ce7fe
1 From 1ae0eca39ba6af27f37e2fe81395b91a2761a408 Mon Sep 17 00:00:00 2001
2 Message-Id: <1ae0eca39ba6af27f37e2fe81395b91a2761a408.1600627676.git-series.worldofpeace@protonmail.ch>
3 From: WORLDofPEACE <worldofpeace@protonmail.ch>
4 Date: Sun, 20 Sep 2020 14:46:59 -0400
5 Subject: [PATCH] fix paths
7 ---
8 gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++---
9 gnome-initial-setup/pages/timezone/tz.h | 4 ++--
10 3 files changed, 5 insertions(+), 5 deletions(-)
12 diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
13 index 196abf6..613d0e5 100644
14 --- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
15 +++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
16 @@ -177,9 +177,9 @@ preview_cb (GtkLabel *label,
17 return TRUE;
19 if (variant[0])
20 - commandline = g_strdup_printf ("tecla \"%s+%s\"", layout, variant);
21 + commandline = g_strdup_printf ("@tecla@/bin/tecla \"%s+%s\"", layout, variant);
22 else
23 - commandline = g_strdup_printf ("tecla %s", layout);
24 + commandline = g_strdup_printf ("@tecla@/bin/tecla %s", layout);
25 g_spawn_command_line_async (commandline, NULL);
26 g_free (commandline);
28 @@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
29 g_param_spec_string ("showing-extra", "", "", "",
30 G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
32 - signals[CHANGED] =
33 + signals[CHANGED] =
34 g_signal_new ("changed",
35 G_TYPE_FROM_CLASS (object_class),
36 G_SIGNAL_RUN_FIRST,
37 diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
38 index a2376f8..5cb7bc9 100644
39 --- a/gnome-initial-setup/pages/timezone/tz.h
40 +++ b/gnome-initial-setup/pages/timezone/tz.h
41 @@ -28,7 +28,7 @@
42 G_BEGIN_DECLS
44 #ifndef __sun
45 -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
46 +# define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"
47 #else
48 # define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
49 #endif
51 base-commit: 5132e206a6bf81964450561d68473ac015760455
52 --
53 git-series 0.9.1