Lookup gzdoom pk3 files in the installed directory in
addition to the path that is stored in ~/.config/gzdoom/.
Simply replacing the hardcoded /usr/share would leave the
configfile pointing to outdated guix builds, which could get
garbage collected and break the gzdoom installation.
This ensures that the files installed with the corresponding
build will be used.
--- /src/d_main.cpp 2018-01-16 22:13:09.700602781 +0200
+++ /src/d_main.cpp 2018-01-16 22:22:36.560617961 +0200
@@ -1716,6 +1716,11 @@
return wad;
}
+ mysnprintf (wad, countof(wad), "%s/%s", GUIX_OUT_PK3, file);
+ if (DirEntryExists (wad)) {
+ return wad;
+ }
+
if (GameConfig != NULL && GameConfig->SetSection ("FileSearch.Directories"))
{
const char *key;
option>
build-system: Add 'channel-build-system'....* gnu/ci.scm (channel-build-system, channel-source->package): Remove.
* gnu/packages/package-management.scm (channel-source->package): New
procedure, moved from (gnu ci).
* guix/build-system/channel.scm: New file, with code moved from (gnu ci).
* doc/guix.texi (Build Systems): Document it.
tests: System tests really parameterize 'current-guix-package'....Until now, 'current-guix-package' was parameterized in the wrong
context. Thus, 'current-guix' would end up building a variant of the
'guix' package instead of the package returned by
'channel-source->package', which is much less expensive to build.
* etc/system-tests.scm (mparameterize): New macro.
(tests-for-current-guix): Change the 'value' field of each <system-test>
record to parameterize 'current-guix-package' for good.