git.iko.soy/typeable/nixpkgs
on master help sign in
openmw-tes3mp: fix build
commit2414e8d51d725babb76b1b6303d7770f7a059c61 authorgnidorah <gnidorah@users.noreply.github.com> dateWed 22 Jan 2020, 22:06 (7 years ago) parent500a8ff
3 files changed+10−4
pkgs/games/openmw/default.nix+2−2 pkgs/games/openmw/tes3mp.nix+1−1 pkgs/top-level/all-packages.nix+7−1
pkgs/games/openmw/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, mkDerivation, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg
1+{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg
22, boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }:
33
44let
@@ -10,7 +10,7 @@ let
1010 sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb";
1111 };
1212 });
13−in mkDerivation rec {
13+in mkDerivationWith stdenv.mkDerivation rec {
1414 version = "0.45.0";
1515 pname = "openmw";
1616
pkgs/games/openmw/tes3mp.nix+1−1
@@ -71,7 +71,7 @@ in openmw.overrideAttrs (oldAttrs: rec {
7171 description = "Multiplayer for TES3:Morrowind based on OpenMW";
7272 homepage = https://tes3mp.com/;
7373 license = licenses.gpl3;
74− platforms = platforms.linux;
74+ platforms = [ "x86_64-linux" "i686-linux" ];
7575 maintainers = with maintainers; [ gnidorah ];
7676 };
7777})
pkgs/top-level/all-packages.nix+7−1
@@ -23205,7 +23205,13 @@ in
2320523205
2320623206 openmw = libsForQt5.callPackage ../games/openmw { };
2320723207
23208− openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };
23208+ openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix {
23209+ openmw = openmw.override {
23210+ stdenv = gcc8Stdenv;
23211+ openscenegraph = openscenegraph.override { stdenv = gcc8Stdenv; };
23212+ mygui = mygui.override { stdenv = gcc8Stdenv; };
23213+ };
23214+ };
2320923215
2321023216 openraPackages = import ../games/openra pkgs;
2321123217