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

Merge pull request #57493 from marius851000/openmw

Browse Source 
openmw: 0.43 -> 0.44
This commit is contained in:
Dmitry Kalinkin 2019-03-14 14:34:54 -04:00 committed by GitHub
commit 9034847242
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal { stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg
, libXt, pkgconfig }: , boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }:
let let
openscenegraph_ = openscenegraph.overrideDerivation (self: { openscenegraph_ = openscenegraph.overrideDerivation (self: {
@ -11,20 +11,24 @@ let
}; };
}); });
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "0.43.0"; version = "0.44.0";
name = "openmw-${version}"; name = "openmw-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OpenMW"; owner = "OpenMW";
repo = "openmw"; repo = "openmw";
rev = name; rev = name;
sha256 = "1nybxwp77qswjayf0g9xayp4x1xxq799681rhjlggch127r07ifi"; sha256 = "0rxkw0bzag7qffifg28dyyga47aaaf5ziiccpv7p8yax1wglvymh";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; 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; { meta = with stdenv.lib; {
description = "An unofficial open source engine reimplementation of the game Morrowind"; description = "An unofficial open source engine reimplementation of the game Morrowind";

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

@ -20934,7 +20934,7 @@ in
openjk = callPackage ../games/openjk { }; openjk = callPackage ../games/openjk { };
openmw = callPackage ../games/openmw { }; openmw = libsForQt5.callPackage ../games/openmw { };
openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { }; openmw-tes3mp = libsForQt5.callPackage ../games/openmw/tes3mp.nix { };