# We insert a hook called "@SOUND_THEME_DIRECTORY@" where, at build time, we
# insert the directory of the package "sound-theme-freedesktop" in the store.

--- src/sound-theme-spec.c.orig	2015-01-11 13:13:29.520527358 +0100
+++ src/sound-theme-spec.c	2015-01-11 14:27:23.035046849 +0100
@@ -321,9 +321,13 @@
         const char *g;
 
         if (!(g = getenv("XDG_DATA_DIRS")) || *g == 0)
-                return "/usr/local/share:/usr/share";
-
-        return g;
+                return "@SOUND_THEME_DIRECTORY@";
+        else {
+                const char *stp = ":@SOUND_THEME_DIRECTORY@";
+                size_t len = strlen(stp) + strlen(g) + 1;
+                char *g2 = (char*) malloc(len);
+                return strcat(strcpy(g2, g), stp);
+        }
 }
 
 static int load_theme_dir(ca_theme_data *t, const char *name) {
ect> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=51d36964800013b679a499927208444cf1374ba1'>refs</a><a class='active' href='/guix/log/gnu/bootloader/depthcharge.scm'>log</a><a href='/guix/tree/gnu/bootloader/depthcharge.scm?id=51d36964800013b679a499927208444cf1374ba1'>tree</a><a href='/guix/commit/gnu/bootloader/depthcharge.scm?id=51d36964800013b679a499927208444cf1374ba1'>commit</a><a href='/guix/diff/gnu/bootloader/depthcharge.scm?id=51d36964800013b679a499927208444cf1374ba1'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/bootloader/depthcharge.scm'>
<input type='hidden' name='id' value='51d36964800013b679a499927208444cf1374ba1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=51d36964800013b679a499927208444cf1374ba1'>root</a>/<a href='/guix/log/gnu?id=51d36964800013b679a499927208444cf1374ba1'>gnu</a>/<a href='/guix/log/gnu/bootloader?id=51d36964800013b679a499927208444cf1374ba1'>bootloader</a>/<a href='/guix/log/gnu/bootloader/depthcharge.scm?id=51d36964800013b679a499927208444cf1374ba1'>depthcharge.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/bootloader/depthcharge.scm?id=51d36964800013b679a499927208444cf1374ba1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-05-20 08:30:35 -0400'>2020-05-20</span></td><td><a href='/guix/commit/gnu/bootloader/depthcharge.scm?id=b460ba7992a0b4af2ddb5927dcf062784539ef7b'>bootloader: grub: Allow booting from a Btrfs subvolume.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/bootloader/grub.scm (strip-mount-point): Remove procedure.
(normalize-file): Add procedure.
(grub-configuration-file): New BTRFS-SUBVOLUME-FILE-NAME parameter.  When
defined, prepend its value to the kernel and initrd file names, using the
NORMALIZE-FILE procedure.  Adjust the call to EYE-CANDY to pass the
BTRFS-SUBVOLUME-FILE-NAME argument.  Normalize the KEYMAP file as well.
(eye-candy): Add a BTRFS-SUBVOLUME-FILE-NAME parameter, and use it, along with
the NORMALIZE-FILE procedure, to normalize the FONT-FILE and IMAGE nested
variables.  Adjust doc.
* gnu/bootloader/depthcharge.scm (depthcharge-configuration-file): Adapt.
* gnu/bootloader/extlinux.scm (extlinux-configuration-file): Likewise.
* gnu/system/file-systems.scm (btrfs-subvolume?)
(btrfs-store-subvolume-file-name): New procedures.
* gnu/system.scm (operating-system-bootcfg): Specify the Btrfs
subvolume file name the store resides on to the
`operating-system-bootcfg' procedure, using the new
BTRFS-SUBVOLUME-FILE-NAME argument.
* doc/guix.texi (File Systems): Add a Btrfs subsection to document the use of
subvolumes.
* gnu/tests/install.scm (%btrfs-root-on-subvolume-os)
(%btrfs-root-on-subvolume-os-source)
(%btrfs-root-on-subvolume-installation-script)
(%test-btrfs-root-on-subvolume-os): New variables.
</span></span></td><td>Maxim Cournoyer</td></tr>