Commit Graph

6990 Commits

Author SHA1 Message Date
Luflosi
60002cabc0
aaaaxy: init at 1.3.372 2023-03-16 01:50:28 +01:00
Weijia Wang
47ca1928a0
Merge pull request #220750 from Netruk44/openmw-darwin-support
openmw: darwin support
2023-03-16 00:28:34 +02:00
Weijia Wang
595d19ebde
Merge pull request #221319 from wegank/megaglest-wxgtk
megaglest: migrate to wxGTK32
2023-03-15 21:44:01 +02:00
Weijia Wang
ca7452e44a megaglest: migrate to wxGTK32 2023-03-15 14:56:52 +02:00
github-actions[bot]
e196e68bee
Merge master into staging-next 2023-03-14 12:01:32 +00:00
superherointj
087f4d3bf5
Merge pull request #221134 from trofi/fheroes2-update
fheroes2: 1.0.1 -> 1.0.2
2023-03-14 06:43:19 -03:00
Sergei Trofimovich
18055cefb1 fheroes2: 1.0.1 -> 1.0.2
Changes: https://github.com/ihhub/fheroes2/releases/tag/1.0.2
2023-03-14 08:59:20 +00:00
Martin Weinelt
6b67186fe9
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/crownstone-cloud/default.nix
- pkgs/development/python-modules/exrex/default.nix
- pkgs/development/python-modules/mkdocs-minify/default.nix
- pkgs/development/python-modules/myjwt/default.nix
- pkgs/development/tools/analysis/checkov/default.nix
2023-03-14 08:14:26 +01:00
Artturi
b978bf0f0f
Merge pull request #220570 from Artturin/fixlints1 2023-03-14 02:15:55 +02:00
Martin Weinelt
bb14c4255b Merge remote-tracking branch 'origin/master' into staging-next 2023-03-13 17:14:19 +00:00
Luke Granger-Brown
fb77124c3f
Merge pull request #220827 from lukegb/factorio
factorio: various updates (1.1.76 stable, 1.1.77 experimental)
2023-03-13 15:27:27 +00:00
~fonnyx-nopmer
07f14e42c4 openmw-tes3mp: unstable-2020-08-07 -> 0.8.1, unbreak 2023-03-13 21:59:07 +08:00
Daniel Perry
fb9bcc72fd openmw: add darwin support
The OpenMW codebase already has Darwin build support within it, so porting
it over to nixpkgs was something I wanted to try out.

Issues encountered, in order:

A few dependencies in nixpkgs were missing Darwin support. Details of those
changes are in their respective commits.

After the dependencies were building, the build first failed with a missing
reference to VideoDecodeAcceleration, which was easily dealt with.

Then the build succeeded! Job's done, success! Except OpenMW.app was nowhere
to be found in the result folder. OpenMW-CS.app, however, was produced and
appeared to be running correctly (though I will admit I didn't test it very
much as I'm not very familiar).

Going through OpenMW's CMakeLists.txt showed that a CMake define was needed,
`OPENMW_OSX_DEPLOYMENT=ON`. This is what enables OpenMW.app to be built.

Once the define was added, the build began to fail with missing plugins to
OpenSceneGraph. Looking into that showed that OSG doesn't build certain plugins
on Darwin due to the fact that their functionality is replicated by built-
in system libraries. To save space, these libraries are not built on Darwin.

OpenMW, however, requires these libraries to exist. I was familiar with the
process of building OpenMW on Darwin already, due to having built it locally
ahead of time, so I remembered that the OpenMW folks have a separate repository
with Mac-specific patches. One of those patches is to OpenSceneGraph for this
exact issue, which is now applied here.

The next error was caused by `fixup_bundle` running from the OpenMW CMakeLists.txt,
which appears to be broken in Darwin under Nix. Searching nixpkgs shows that others
have worked around the issue by removing the call to `fixup_bundle` completely.

At this point, the build passed and OpenMW.app was created and was executable!
After the intro video played, it was clear that something wasn't working though.
Every texture was completely pink, navigating the main menu was impossible. Looking
at the console output showed that OpenSceneGraph was attempting to load dds
textures, but the plugin for doing so could not be loaded. I looked at the plugin
with `file` which showed the file was actually a bash script. It was setting
some QT environment variables before calling the real plugin executable. I
resolved this issue with setting `dontWrapQtApps`, as everything seems to work
without it (even the QT-based apps like the Construction Set).
2023-03-12 18:48:50 -04:00
Martin Weinelt
d03d74aa67
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/aiopulse/default.nix
- pkgs/development/python-modules/identify/default.nix
- pkgs/development/python-modules/spur/default.nix
2023-03-12 23:28:23 +01:00
Lily Foster
5a1dc8acd9
Merge pull request #214031 from sersorrel/xivlauncher-gstreamer
xivlauncher: include GStreamer in closure
2023-03-12 16:51:36 -04:00
Martin Weinelt
4e57d4321a
anki: Add mock to check inputs
Probably got propagated from somewhere and doesn't anymore, which caused
the breakage.
2023-03-12 19:13:10 +01:00
Vladimír Čunát
1f7eeea8ee
Merge branch 'master' into staging-next 2023-03-12 17:21:00 +01:00
Guillaume Girol
1c834e1eeb
Merge pull request #220126 from Scrumplex/prismlauncher-wrap
prismlauncher: use qtWrapperArgs
2023-03-12 15:56:59 +00:00
Luke Granger-Brown
fcd190ad2a factorio-headless: 1.1.74 -> 1.1.76 2023-03-12 12:59:20 +00:00
Luke Granger-Brown
fdd814ce0d factorio-headless-experimental: 1.1.76 -> 1.1.77 2023-03-12 12:59:18 +00:00
Luke Granger-Brown
1b8cb12471 factorio-demo: 1.1.69 -> 1.1.76 2023-03-12 12:59:17 +00:00
Luke Granger-Brown
fad4960c41 factorio-experimental: 1.1.76 -> 1.1.77 2023-03-12 12:59:15 +00:00
Luke Granger-Brown
a8e0c501e1 factorio: 1.1.74 -> 1.1.76 2023-03-12 12:56:50 +00:00
Vladimír Čunát
1dd94ad62f
Merge branch 'master' into staging-next 2023-03-12 09:06:28 +01:00
Nick Cao
f6663692d2
Merge pull request #220552 from lasers/sm64ex
sm64ex: 0.pre+date=2021-11-30 -> unstable-2022-12-19
2023-03-12 15:03:37 +08:00
Nick Cao
2805e99b9d
Merge pull request #220553 from lasers/sm64ex-coop
sm64ex-coop: 0.pre+date=2022-08-05 -> unstable-2023-02-22
2023-03-12 15:02:50 +08:00
github-actions[bot]
feb117e32c
Merge master into staging-next 2023-03-11 18:01:19 +00:00
Weijia Wang
709464e56f
Merge pull request #220139 from r-ryantm/auto-update/vassal
vassal: 3.6.13 -> 3.6.14
2023-03-11 19:49:50 +02:00
Weijia Wang
58e706ad00
Merge pull request #220151 from r-ryantm/auto-update/unciv
unciv: 4.5.2 -> 4.5.5
2023-03-11 19:43:51 +02:00
ash
b69554a0d2 xivlauncher: include GStreamer in closure 2023-03-11 15:44:09 +00:00
lasers
4e96143c7d sm64ex-coop: 0.pre+date=2022-08-05 -> unstable-2023-02-22 2023-03-11 02:57:34 -06:00
lasers
7be3956a46 sm64ex: 0.pre+date=2021-11-30 -> unstable-2022-12-19 2023-03-11 02:56:57 -06:00
github-actions[bot]
9ffe17a0be
Merge master into staging-next 2023-03-11 00:02:37 +00:00
Artturin
cab4a24c34 treewide: fix lints
Arg to lib.optional is a list

build time tool in buildInputs
2023-03-11 00:55:17 +02:00
Sergei Trofimovich
2f357f268a
Merge pull request #220398 from trofi/unnethack-disable-parallelism
unnethack: disable build parallelism
2023-03-10 21:55:57 +00:00
R. Ryantm
88b9be949d unciv: 4.5.2 -> 4.5.5 2023-03-10 18:15:03 +00:00
Martin Weinelt
da1a690688 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-10 01:50:42 +01:00
Sergei Trofimovich
ef50d32769 unnethack: disable build parallelism
Without the change the build fails occasionally as:

    gcc -DAUTOCONF -Wall -I../include -I./../include -g -O2  -c ./../sys/unix/unixmain.c
    ./../sys/unix/unixmain.c:9:10: fatal error: date.h: No such file or directory
        9 | #include "date.h"
          |          ^~~~~~~~
2023-03-09 23:12:31 +00:00
Sandro
a59944f1c1
Merge pull request #208296 from JamieMagee/runelite 2023-03-09 23:18:52 +01:00
github-actions[bot]
7072ae38b6
Merge master into staging-next 2023-03-08 18:01:34 +00:00
Linus Heckemann
f9e3269e49
Merge pull request #219429 from cyplo/endless-sky
endless-sky:0.9.14 -> 0.9.16.1
2023-03-08 17:50:07 +01:00
Martin Weinelt
4729f61158 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-08 15:04:13 +01:00
R. Ryantm
60ba476076 vassal: 3.6.13 -> 3.6.14 2023-03-08 11:20:29 +00:00
Sandro
7f917aebcd
Merge pull request #214941 from OPNA2608/init/katawa-shoujo
katawa-shoujo: init at 1.3.1
2023-03-08 11:13:54 +01:00
Sefa Eyeoglu
2f9b913c50
prismlauncher: use qtWrapperArgs
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
2023-03-08 11:05:26 +01:00
github-actions[bot]
d4187810f9
Merge master into staging-next 2023-03-08 00:02:34 +00:00
OPNA2608
992b72241d katawa-shoujo: Add desktop file
unrpa works again so we can extract the icon from the game assets for it.
2023-03-08 00:25:30 +01:00
Francesco Gazzetta
03ea0168f4
Merge pull request #218173 from TheKostins/mindustry-142
mindustry: 141.2 -> 142
2023-03-07 18:34:40 +00:00
Konstantin
27684f8832
mindustry: 141.2 -> 142 2023-03-07 20:53:50 +03:00
Martin Weinelt
e3f019bb71 Merge remote-tracking branch 'origin/master' into staging-next 2023-03-07 15:05:00 +01:00