public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openmw-tes3mp: fix build

This commit is contained in:
gnidorah 2020-01-22 22:06:40 +03:00 committed by Frederik Rietdijk
parent 500a8ffd96
commit 2414e8d51d
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/openmw/default.nix
View File

@ -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 }: , boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }:
let let
@ -10,7 +10,7 @@ let
sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb"; sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb";
}; };
}); });
in mkDerivation rec { in mkDerivationWith stdenv.mkDerivation rec {
version = "0.45.0"; version = "0.45.0";
pname = "openmw"; pname = "openmw";

2
pkgs/games/openmw/tes3mp.nix
View File

@ -71,7 +71,7 @@ in openmw.overrideAttrs (oldAttrs: rec {
description = "Multiplayer for TES3:Morrowind based on OpenMW"; description = "Multiplayer for TES3:Morrowind based on OpenMW";
homepage = https://tes3mp.com/; homepage = https://tes3mp.com/;
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = with maintainers; [ gnidorah ]; maintainers = with maintainers; [ gnidorah ];
}; };
}) })

8
pkgs/top-level/all-packages.nix
View File

@ -23205,7 +23205,13 @@ in
openmw = libsForQt5.callPackage ../games/openmw { }; 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; openraPackages = import ../games/openra pkgs;