From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX2E8-0007dp-DB for guix-patches@gnu.org; Mon, 17 Jul 2017 05:22:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX2E6-0007gd-Gd for guix-patches@gnu.org; Mon, 17 Jul 2017 05:22:04 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:40529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dX2E6-0007gZ-Co for guix-patches@gnu.org; Mon, 17 Jul 2017 05:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dX2E6-00053Q-7i for guix-patches@gnu.org; Mon, 17 Jul 2017 05:22:02 -0400 Subject: [bug#27675] [PATCH] gnu: kbd: Recursively search $LOADKEYS_KEYMAP_PATH. Resent-Message-ID: From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170713003425.31282-1-me@tobias.gr> Date: Mon, 17 Jul 2017 11:20:55 +0200 In-Reply-To: <20170713003425.31282-1-me@tobias.gr> (Tobias Geerinckx-Rice's message of "Thu, 13 Jul 2017 02:34:25 +0200") Message-ID: <87poczctc8.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Tobias Geerinckx-Rice Cc: 27675@debbugs.gnu.org Hello! Tobias Geerinckx-Rice skribis: > Fix a regression since commit fd7000fe33d3c4188c241cab97e2b891dd4e1268. > > * gnu/packages/linux.scm (kbd)[native-search-path]: Add a double asterisk. > --- > gnu/packages/linux.scm | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm > index c5fed1a7c..700408cc8 100644 > --- a/gnu/packages/linux.scm > +++ b/gnu/packages/linux.scm > @@ -1837,7 +1837,10 @@ system.") > (native-search-paths > (list (search-path-specification > (variable "LOADKEYS_KEYMAP_PATH") > - (files (list "share/keymaps"))))) > + ;; Append =E2=80=98/**=E2=80=99 to recursively search all di= rectories. One can then > + ;; run (for example) =E2=80=98loadkeys en-latin9=E2=80=99 in= stead of having to find > + ;; and type =E2=80=98i386/colemak/en-latin9=E2=80=99 on an u= nfamiliar keyboard. > + (files (list "share/keymaps/**"))))) That works if you copy paste the suggested search path in a shell, but not if we pass it to =E2=80=98evaluate-search-paths=E2=80=99 from (guix sea= rch-paths) (it doesn=E2=80=99t recognize the ** syntax.) What about: (search-path-specification (variable "LOADKEYS_KEYMAP_PATH") (files (list "share/keymaps")) (file-type 'regular) (file-pattern ".*")) ;or "\\.map"? That gives this: --8<---------------cut here---------------start------------->8--- scheme@(guix search-paths)> (search-path-specification (variable "LOADKEYS_KEYMAP_PATH") (files (list "share/keymaps")) (file-type 'regular) (file-pattern ".*")) $8 =3D #< variable: "LOADKEYS_KEYMAP_PATH" files= : ("share/keymaps") separator: ":" file-type: regular file-pattern: ".*"> scheme@(guix search-paths)> (evaluate-search-paths (list $8) (list "/run/cu= rrent-system/profile")) $9 =3D ((#< variable: "LOADKEYS_KEYMAP_PATH" fil= es: ("share/keymaps") separator: ":" file-type: regular file-pattern: ".*">= . "/run/current-system/profile/share/keymaps/amiga/amiga-de.map.gz:/run/cu= rrent-system/profile/share/keymaps/amiga/amiga-us.map.gz:/run/current-syste= m/profile/share/keymaps/atari/atari-de.map.gz:/run/current-system/profile/s= hare/keymaps/atari/atari-se.map.gz:/run/current-system/profile/share/keymap= s/atari/atari-uk-falcon.map.gz:/run/current-system/profile/share/keymaps/at= ari/atari-us.map.gz:/run/current-system/profile/share/key=E2=80=A6 --8<---------------cut here---------------end--------------->8--- Is this correct? Ludo=E2=80=99.