diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/openmw/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/openmw/tes3mp.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index d9c992199c40..a7e386398d23 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg +{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg , boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }: let @@ -10,7 +10,7 @@ let sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb"; }; }); -in mkDerivation rec { +in mkDerivationWith stdenv.mkDerivation rec { version = "0.45.0"; pname = "openmw"; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 4bbddfbb1dfb..9570acfdbaaf 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -71,7 +71,7 @@ in openmw.overrideAttrs (oldAttrs: rec { description = "Multiplayer for TES3:Morrowind based on OpenMW"; homepage = https://tes3mp.com/; license = licenses.gpl3; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ gnidorah ]; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144999e31d58..d462acbdfede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23205,7 +23205,13 @@ in openmw = libsForQt5.callPackage ../games/openmw { }; - openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; + openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { + openmw = openmw.override { + stdenv = gcc8Stdenv; + openscenegraph = openscenegraph.override { stdenv = gcc8Stdenv; }; + mygui = mygui.override { stdenv = gcc8Stdenv; }; + }; + }; openraPackages = import ../games/openra pkgs; |