Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

openmw: 0.43 -> 0.44 #57493

Merged
merged 2 commits into from
Mar 14, 2019
Merged

openmw: 0.43 -> 0.44 #57493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
610757e
openmw: 0.43 -> 0.44; update to qt5
marius851000 Mar 13, 2019
2d03ed2
openmw: force the need of qt5
marius851000 Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions pkgs/games/openmw/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
, libXt, pkgconfig }:
{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg
, boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }:

let
openscenegraph_ = openscenegraph.overrideDerivation (self: {
Expand All @@ -11,20 +11,24 @@ let
};
});
in stdenv.mkDerivation rec {
version = "0.43.0";
version = "0.44.0";
name = "openmw-${version}";

src = fetchFromGitHub {
owner = "OpenMW";
repo = "openmw";
rev = name;
sha256 = "1nybxwp77qswjayf0g9xayp4x1xxq799681rhjlggch127r07ifi";
sha256 = "0rxkw0bzag7qffifg28dyyga47aaaf5ziiccpv7p8yax1wglvymh";
};

enableParallelBuilding = true;

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph_ SDL2 unshield openal libXt ];
buildInputs = [ cmake boost ffmpeg bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ];

cmakeFlags = [
"-DDESIRED_QT_VERSION:INT=5"
];

meta = with stdenv.lib; {
description = "An unofficial open source engine reimplementation of the game Morrowind";
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20866,7 +20866,7 @@ in

openjk = callPackage ../games/openjk { };

openmw = callPackage ../games/openmw { };
openmw = libsForQt5.callPackage ../games/openmw { };

openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };

Expand Down