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.

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 -> 0.44.0 #55760

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 21 additions & 9 deletions pkgs/games/openmw/default.nix
Original file line number Diff line number Diff line change
@@ -1,36 +1,48 @@
{ stdenv, fetchFromGitHub, qt4, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal
, libXt, pkgconfig }:
{ stdenv, fetchFromGitHub, cmake, doxygen, pkgconfig
, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, SDL2, unshield, openal
, giflib, libXt }:

let
openscenegraph_ = openscenegraph.overrideDerivation (self: {
name = "openmw-openscenegraph";

src = fetchFromGitHub {
owner = "OpenMW";
repo = "osg";
rev = "2b4c8e37268e595b82da4b9aadd5507852569b87";
sha256 = "0admnllxic6dcpic0h100927yw766ab55dix002vvdx36i6994jb";
};
});

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 ];
nativeBuildInputs = [ cmake doxygen pkgconfig ];

buildInputs = [
qtbase
boost bullet ffmpeg libXt mygui openal openscenegraph_ SDL2 unshield
];

cmakeFlags = [
"-DDESIRED_QT_VERSION=5"
];

meta = with stdenv.lib; {
description = "An unofficial open source engine reimplementation of the game Morrowind";
homepage = http://openmw.org;
license = licenses.gpl3;
platforms = platforms.linux;
homepage = "https://openmw.org";
license = licenses.gpl3;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
};
}
24 changes: 17 additions & 7 deletions pkgs/tools/system/thinkfan/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
{ stdenv, fetchurl, cmake }:
{ stdenv, fetchFromGitHub, cmakeCurses, libyamlcpp, libatasmart, pkgconfig }:

stdenv.mkDerivation rec {
name = "thinkfan-${version}";
version = "0.9.3";
version = "1.0.1";

src = fetchurl {
url = "mirror://sourceforge/thinkfan/thinkfan-${version}.tar.gz";
sha256 = "0nz4c48f0i0dljpk5y33c188dnnwg8gz82s4grfl8l64jr4n675n";
src = fetchFromGitHub {
owner = "vmatare";
repo = "thinkfan";
rev = "${version}";
sha256 = "1983p8aryfgpyhflh5r5xz27y136a4vvm7plgrg44q4aicqbcp8j";
};

nativeBuildInputs = [ cmake ];
configureFlags = [
"-DCMAKE_INSTALL_DOCDIR==share/doc/${name}"
"-DUSE_NVML=OFF"
"-DUSE_ATASMART=ON"
"-DUSE_YAML=ON"
];

nativeBuildInputs = [ cmakeCurses pkgconfig ];
buildInputs = [ libyamlcpp libatasmart ];

installPhase = ''
install -Dm755 {.,$out/bin}/thinkfan
Expand All @@ -22,7 +32,7 @@ stdenv.mkDerivation rec {

meta = {
license = stdenv.lib.licenses.gpl3;
homepage = http://thinkfan.sourceforge.net/;
homepage = https://github.com/vmatare/thinkfan;
maintainers = with stdenv.lib.maintainers; [ domenkozar ];
platforms = stdenv.lib.platforms.linux;
};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20830,7 +20830,7 @@ in

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

openmw = callPackage ../games/openmw { };
openmw = callPackage ../games/openmw { qtbase = qt5.qtbase; };

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

Expand Down