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; tion> Wojtek's customized Guix
aboutsummaryrefslogtreecommitdiff
path: root/tests/guix-shell.sh
AgeCommit message (Expand)Author
2022-11-15guix: shell: Add '--symlink' option....* guix/scripts/pack.scm (%options): Extract symlink parsing logic to... (symlink-spec-option-parser): ... here. (self-contained-tarball/builder): Add a comment mentioning why a relative file name is used for the link target. * guix/scripts/environment.scm (show-environment-options-help): Document new --symlink option. (%default-options): Add default value for symlinks. (%options): Register new symlink option. (launch-environment/container): Add #:symlinks argument and extend doc, and create symlinks using evaluate-populate-directive. (guix-environment*): Pass symlinks arguments to launch-environment/container. * doc/guix.texi (Invoking guix shell): Document it. * tests/guix-shell.sh: Add a --symlink (negative) test. * tests/guix-environment-container.sh: Add tests. Maxim Cournoyer
2022-09-04store: Open daemon connections with SOCK_CLOEXEC....Previously, 'guix shell' for example would leak the socket that's connected to the daemon. * guix/store.scm (open-unix-domain-socket, open-inet-socket): Pass SOCK_CLOEXEC to 'socket'. * tests/guix-shell.sh: Add test. Ludovic Courtès
2022-02-18profiles: 'profile-derivation' rejects unsupported packages....Previously user-facing commands would happily start building packages even if they do not support that system. With this change, all the user-facing commands reject unsupported packages without going further. * guix/profiles.scm (profile-derivation): Add #:allow-unsupported-packages?. Define 'check-supported-packages' and honor #:allow-unsupported-packages?. * tests/guix-pack.sh, tests/guix-package.sh, tests/guix-shell.sh: Ensure that unsupported packages are rejected. * tests/guix-system.sh: Pass "--system=armhf-linux" when attempting to build gnu/system/examples/asus-c201.tmpl. Ludovic Courtès
2021-12-10Merge remote-tracking branch 'signed/master' into core-updatesMathieu Othacehe
2021-12-10shell: When using '-D -f', '-D' has no effect on remaining packages....Fixes <https://issues.guix.gnu.org/52093>. Reported by Konrad Hinsen <konrad.hinsen@fastmail.net>. * guix/scripts/shell.scm (%options): In "--file" handler, add call to 'ensure-ad-hoc'. * tests/guix-shell.sh: Add test. Ludovic Courtès
2021-11-18shell: Adjust test to expect C_INCLUDE_PATH, not CPATH....This is a followup to 2a3cd4ee3557fbbdca42b5ec2f3ec4546c270203. * tests/guix-shell.sh: Expect C_INCLUDE_PATH instead of CPATH. Ludovic Courtès