- Simplify some symlinking
- Don't remove the temporary run directory: umoria allows for dumping
character info, which would be in there and inaccessible after
saving the game otherwise. The system takes care of cleaning up
the temporary directory anyway.
- Allow passing arguments to the wrapped executable, allowing using
different save directories, passing game seeds, checking out
highscores, etc.
It was impossible to continue a saved character before, as the
`cleanup` function would remove the whole temporary RUNDIR, including
the actual save file.
umoria allows passing a custom save file location, which now points to
the already-used data directory ~/.umoria.
Fixes#178136
- Add meta.mainProgram to be able to use nix run
- Run preInstall and postInstall hooks
- Test creation of the save directory in passthru.tests
- Fix some typos and misformatting
- Change prePatch to postPatch (as in the suggestion I got when adding
sil-q)
This makes it possible to compile Angband against SDL2 (and its other
libraries) to have a graphical frontend available, with tiles and
sound. The default remains ASCII-only Angband; enable SDL2 by using
an override.
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Without the change build fails on upstream gcc-10 as:
ld: libgame/libgame.a(system.o):src/libgame/system.c:41: multiple definition of
`setup'; main.o:src/main.c:140: first defined here
Without the change build fails on upstream gcc-10 as:
ld: ball/st_save.o:(.bss+0x0): multiple definition of
`text_input'; share/text.o:(.bss+0x0): first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: main.o:src/main.c:58: multiple definition of
`eclass'; eclass.o:src/eclass.c:21: first defined here
Without the change build fails on upstream gcc-10 as:
ld: liblibmegaglest.a(ftpLib.c.o):(.bss+0x28): multiple definition of
`VERBOSE_MODE_ENABLED'; liblibmegaglest.a(miniftpserver.cpp.o):(.bss+0x30): first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: dnd.o:src/main.h:136: multiple definition of
`MENU_EXT'; main.o:src/main.h:136: first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of
`logFile'; build/linux.release/alan3/act.o:(.bss+0x0): first defined here
Without the change build fails on upstream gcc-10 as:
ld: evalgraph.o:(.bss+0x20): multiple definition of `ics_type'; backend.o:(.bss+0x1df910): first defined here
ld: nevalgraph.o:(.bss+0x8): multiple definition of `currPvInfo'; backend.o:(.bss+0x1df908): first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: CMakeFiles/wswtv_server.dir/__/unix/unix_time.c.o:(.bss+0x8): multiple definition of
`c_pointcontents'; CMakeFiles/wswtv_server.dir/__/null/ascript_null.c.o:(.bss+0x8): first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: r_gl.h:52: multiple definition of `qglGenBuffers';
r_gl.h:52: first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: typespeed-typespeed.o:/build/typespeed-0.6.5/src/typespeed.h:69: multiple definition of
`opt'; typespeed-file.o:/build/typespeed-0.6.5/src/typespeed.h:69: first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: world.o:/build/tf-50b8/src/socket.h:24: multiple definition of
`world_decl'; command.o:/build/tf-50b8/src/socket.h:24: first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: CMakeFiles/t4k_common.dir/t4k_throttle.c.o:(.bss+0x0): multiple definition of
`wrapped_lines'; CMakeFiles/t4k_common.dir/t4k_audio.c.o:(.bss+0x0): first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: main.o:/build/source/Sil/src/externs.h:57: multiple definition of
`mini_screenshot_char'; variable.o:/build/source/Sil/src/externs.h:57: first defined here
Bumps the revision and fixes https://hydra.nixos.org/build/178082390
Mark the version as "unstable" because the latest official version does
not build and there are no new releases.
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: modules/.libs/libmodules.a(rocket_pad.o):/build/lincity-1.13.1/modules/../screen.h:23:
multiple definition of `monthgraph_style'; ldsvguts.o:/build/lincity-1.13.1/screen.h:23: first defined here
Without the change build on upstream gcc-10 fails as:
ld: dfa.o:/build/gnugo-3.8/patterns/../engine/liberty.h:861: multiple definition of
`meaningless_white_moves'; mkpat.o:/build/gnugo-3.8/patterns/../engine/liberty.h:861: first defined here
ld: dfa.o:/build/gnugo-3.8/patterns/../engine/liberty.h:860: multiple definition of
`meaningless_black_moves'; mkpat.o:/build/gnugo-3.8/patterns/../engine/liberty.h:860: first defined here
Without the change build fails on upstream gcc-10 as:
ld: src/brogue/Time.o:/build/brogue-1.7.5/src/brogue/IncludeGlobals.h:51:
multiple definition of `messageArchive'; src/brogue/Architect.o:/build/brogue-1.7.5/src/brogue/IncludeGlobals.h:51: first defined here
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: random.o:(.bss+0x0): multiple definition of `LW_RANDOM_ON'; game.o:(.bss+0x4): first defined here
These derivations use buildDotnetModule, which has had its default
dotnet version changed recently. This patch removes redundantly setting
the SDK/runtime to version 6.
they're unnecessary since https://github.com/NixOS/nixpkgs/pull/161739/files
which links the schemas to their correct fhs locations and adds
gsettings-desktop-schemas and hicolor-icon-theme to appimage fhs
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:
ld: mad.o:(.bss+0x233800): multiple definition of `tile_dict'; camera.o:(.bss+0x140): first defined here
Without the change build fails on -fno-common toolchains like upstream
gcc-10:
ld: hexen/libhexen.a(g_game.o):/build/source/src/hexen/g_game.c:101:
multiple definition of `demoextend'; hexen/libhexen.a(mn_menu.o):
/build/source/src/hexen/mn_menu.c:134: first defined here
Without the change the build against upstream gcc-10 build fails as:
ld: sprite.o:/build/0verkill/data.h:171: multiple definition of `obj_attr'; server.o:/build/0verkill/data.h:171: first defined here
ld: sprite.o:/build/0verkill/data.h:142: multiple definition of `weapon_name'; server.o:/build/0verkill/data.h:142: first defined here
Use -fcommon as a workeround until upstream updates the code.
Touch support requires rebuilding irrlichtmt with touch support, which
upstream does not enable by default. Building Minetest with touch
support also disables the regular interface, so touch support defaults
to off.
Since the previous version of anki no longer works on nixos-unstable
due to glibc changes the version was bumped to 2.1.51 which works.
Also adds support for aarch64 on apple silicon
Fixes#167765
glew alone is not enough to propagate explicitly:
```
$ nix run nixpkgs#mindustry
[E] Failed to initialize discord. Enable debug logging for details.
[E] java.lang.ExceptionInInitializerError
at arc.backend.sdl.SdlApplication.lambda$init$0(SdlApplication.java:73)
at arc.backend.sdl.SdlApplication.check(SdlApplication.java:181)
at arc.backend.sdl.SdlApplication.init(SdlApplication.java:73)
at arc.backend.sdl.SdlApplication.<init>(SdlApplication.java:29)
at mindustry.desktop.DesktopLauncher.main(DesktopLauncher.java:36)
Caused by: arc.util.ArcRuntimeException: Couldn't load shared library 'libsdl-arc64.so' for target: Linux, 64-bit
at arc.util.SharedLibraryLoader.load(SharedLibraryLoader.java:85)
at arc.backend.sdl.jni.SDL.<clinit>(SDL.java:142)
... 5 more
Caused by: arc.util.ArcRuntimeException: java.lang.UnsatisfiedLinkError: /tmp/arc/35a2b27b/libsdl-arc64.so: /nix/store/v8pdm5rd4f89ng08zgxryyil065g1dh2-SDL2-2.0.20/lib/libSDL2.so: cannot open shared object file: No such file or directory
at arc.util.SharedLibraryLoader.loadFile(SharedLibraryLoader.java:288)
at arc.util.SharedLibraryLoader.load(SharedLibraryLoader.java:81)
... 6 more
Caused by: java.lang.UnsatisfiedLinkError: /tmp/arc/35a2b27b/libsdl-arc64.so: /nix/store/v8pdm5rd4f89ng08zgxryyil065g1dh2-SDL2-2.0.20/lib/libSDL2.so: cannot open shared object file: No such file or directory
at java.base/jdk.internal.loader.NativeLibraries.load(Native Method)
at java.base/jdk.internal.loader.NativeLibraries$NativeLibraryImpl.open(NativeLibraries.java:383)
at java.base/jdk.internal.loader.NativeLibraries.loadLibrary(NativeLibraries.java:227)
at java.base/jdk.internal.loader.NativeLibraries.loadLibrary(NativeLibraries.java:169)
at java.base/java.lang.ClassLoader.loadLibrary(ClassLoader.java:2407)
at java.base/java.lang.Runtime.load0(Runtime.java:747)
at java.base/java.lang.System.load(System.java:1857)
at arc.util.SharedLibraryLoader.loadFile(SharedLibraryLoader.java:294)
at arc.backend.sdl.jni.SDL$3.loadFile(SDL.java:140)
at arc.util.SharedLibraryLoader.loadFile(SharedLibraryLoader.java:260)
... 7 more
```
Let's add all SDL and alsa-lib as well. Instead of using propagatedBuildInputs
let's embed store paths into a shell wrapper.
Without the change the build fails on `master` as:
```
tableau.cc:90:9: error: ordered comparison of pointer with integer zero ('unsigned char*' and 'int')
90 | if(Buf<=0) return false;
| ~~~^~~
```
* cudaPackages.cudnn: migrate to redist cudaPackages
* cudaPackages.cudnn: fix missing zlib in rpath
* cudaPackages.cudnn: remove the propagated cudatoolkit
* cudaPackages.cudnn: use autoPatchelfHook
instead of custom find ... -exec ldd | grep routine
mark libcudnn_cnn_infer.so as needed for libcudnn.so on cudnn>=8.0.5
- a hint for autoPatchelf, as an alternative to manually adding $ORIGIN
* cudaPackages.cudnn: use automatic hooks for rpath
as a more common way to use addOpenGLRunpath and autoPatchelf with cudaPackages
* cudaPackages.cudnn: consume individual cuda packages
...since cudnn is part of the cuda package set
- introduces the scary useCudatoolkitRunfile function argument
to discourage usage of the runfile-based cudatoolkit
- instead of the rather hidden useRedist term in let ... in
- repeats cudatoolkit_root pattern after cuda_joined in pytorch &c
(the "toolchain view")
- redist packages are marked optional to support cuda<11.4 where the
attributes for redist packages do not exist
* cudaPackages.cudnn: update to pname+version
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>