Commit Graph

63 Commits

Author SHA1 Message Date
Emily
3ae7b3cd45 openmw: pin FFmpeg 6
Upstream is ready for FFmpeg 7 in the development version, but there
are too many patches to reasonably apply to the release version.
2024-10-03 22:08:27 +01:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
Sergei Trofimovich
2abc33bccf openmw-tes3mp: drop redundant disable-warnings-if-gcc13 2024-02-28 23:12:38 +00:00
Sergei Trofimovich
ebb01d76dd openmw-tes3mp: fix gcc-13 build
Without the change build on `master` fails as:

    In file included from /build/source/components/misc/stringops.hpp:8,
                     from /build/source/components/settings/settings.cpp:6:
    /build/source/components/misc/utf8stream.hpp:11:13: error: 'uint32_t' does not name a type
       11 |     typedef uint32_t UnicodeChar;
          |             ^~~~~~~~
    /build/source/components/misc/utf8stream.hpp:5:1: note: 'uint32_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
        4 | #include <cstring>
      +++ |+#include <cstdint>
2024-02-10 17:32:59 +00:00
Sergei Trofimovich
bbe42235c8 openmw-tes3mp: fix raknet depend build on gcc-13
Without the change build fails on `master` as
https://cache.nixos.org/log/hhs17z23wxncxpbcgy1w98w5zh6xh8qw-raknet-unstable-2020-01-19.drv:

    In file included from /build/source/Source/Utils/_FindFirst.cpp:7:
    /build/source/Source/Utils/_FindFirst.h:50:15: error: 'intptr_t' was not declared in this scope
       50 | int _findnext(intptr_t h, _finddata_t *f);
          |               ^~~~~~~~
2024-02-10 16:34:01 +00:00
Adam Joseph
4b31530a14 openmw.tes3mp: disable-warnings-if-gcc13 2023-12-07 09:11:37 +00:00
Joshua Trees
08170dd535 openmw: 0.47.0 -> 0.48.0
Co-authored-by: Peter Hoeg <peter@hoeg.com>
2023-10-10 10:58:27 +02:00
Sandro Jäckel
fccf04b620 treewide: replace -DCMAKE_BUILD_TYPE in cmakeFlags with cmakeBuildType 2023-09-08 14:18:26 +00:00
Weijia Wang
47ca1928a0
Merge pull request #220750 from Netruk44/openmw-darwin-support
openmw: darwin support
2023-03-16 00:28:34 +02: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
Artturin
f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
Vladimír Čunát
555f300879
treewide: another round of gcc12 fixups 2023-02-05 15:29:43 +01:00
Nick Novitski
fb7287e6d2 openmw: enable with glibc fix 2022-05-10 10:54:06 +08:00
Naïm Favier
9160044f5f
treewide/makeWrapper: replace --run cd with --chdir
Lay the groundwork for switching to binary wrappers by reducing uses
of `--run` (which is not supported by `makeBinaryWrapper`).
2022-03-19 09:46:31 +01:00
Maximilian Bosch
a3f4ff59ae
openmw: mark as broken 2022-02-27 10:26:49 +01:00
marius david
36e16d6979 openmw: 0.46 -> 0.47 2021-11-11 15:23:15 +01:00
Artturi
6463828755
openmw: add wrapQtAppsHook (#132131)
dontWrapQtApps was blanket added in
5590e365e4
2021-07-30 20:40:22 -04:00
Peter Hoeg
7fe78d4f9e openmw-tes3mp: unstable-2019-11-19 -> unstable-2020-08-07 2021-05-20 09:06:25 +08:00
Peter Hoeg
5c87334112 openmw: ffmpeg_3 -> ffmpeg 2021-05-20 09:06:25 +08:00
Sandro Jäckel
ae02415ee8
treewide: remove gnidorah
due to github account removal/deletion and not other mean of contact.
2021-04-30 01:48:19 +02:00
github-actions[bot]
5f9df37683
Merge master into staging-next 2021-02-11 00:36:09 +00:00
Sandro Jäckel
25e7d3949c
openmw: Add comment that commit does not exist on any branch on target repository 2021-01-26 15:19:01 +01:00
Thomas Tuegel
5590e365e4
qtbase: Check for wrapQtAppsHook in setupHook 2021-01-25 15:56:15 -06:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
gnidorah
5b3eac040b
openmw-tes3mp: fix build after #80624 (#91045) 2020-06-18 12:49:27 -04:00
marius851000
c6d32d816c
openmw: 0.45.0 -> 0.46.0 (#90589) 2020-06-16 14:45:23 -04:00
Doron Behar
01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
gnidorah
6405edf2dc
tes3mp: fix working (#88061) 2020-05-20 13:25:36 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
gnidorah
2083c1d8b4 openmw-tes3mp: 2019-07-01 -> 2019-11-19 2020-02-15 15:24:24 +01:00
gnidorah
2414e8d51d openmw-tes3mp: fix build 2020-02-09 17:25:52 +01:00
gnidorah
1c3407f954 openmw-tes3mp: 2019-06-09 -> 2019-07-01 2019-11-04 08:54:02 -08:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
gnidorah
f72d2041b7 openmw: use qt5's mkDerivation 2019-08-19 08:04:51 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
gnidorah
32e72ad896 openmw-tes3mp: 0.7.0-alpha -> 2019-06-09
Closes #64587.

abbradar: clarify source of CrabNet revision.
2019-07-20 10:24:43 +03:00
marius851000
3a6bc6e35d openmw: 0.44 -> 0.45 (#58486) 2019-03-29 21:59:34 -04:00
marius851000
2d03ed2f8d openmw: force the need of qt5 2019-03-14 15:53:34 +01:00
marius851000
610757e024 openmw: 0.43 -> 0.44; update to qt5 2019-03-13 08:33:02 +01:00
gnidorah
6b79f059b2 openmw-tes3mp: 0.6.0 -> 0.7.0-alpha 2019-01-13 17:54:59 +03:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Will Dietz
a8f3b1ad75 openmw: update hash missed in update to 0.43.0
Fixes #39712
2018-04-30 13:27:36 -05:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Nikolay Amiantov
72d4625218 openmw: 0.42.0 -> 0.43.0 2018-02-25 22:24:09 +03:00
Alexander V. Nikolaev
8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00